Skip to content

Commit

Permalink
Migrate to Toptal (#494)
Browse files Browse the repository at this point in the history
* Migrate to Toptal

* updated repository urls

* synced the submodule for templates
  • Loading branch information
berthj193 authored Jun 8, 2020
1 parent 83dbcff commit 67b534c
Show file tree
Hide file tree
Showing 144 changed files with 5,546 additions and 43,086 deletions.
3 changes: 1 addition & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ Gitignore.io's vision is to become the authoritative source for `.gitignore` tem

## Ways You Can Help

1. **Add Templates** - Add templates for Programming Languages, Operating Systems and IDEs at [@dvcs/gitignore](https://github.com/dvcs/gitignore)
1. **Add Templates** - Add templates for Programming Languages, Operating Systems and IDEs at [@toptal/gitignore](https://github.com/toptal/gitignore)
2. **Explore** - Create better ways for users to interact with gitignore.io.
3. **Donate** - [Donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5J2MWBD73BQAS) to help cover server costs.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@


**Q:** How do I submit a new <code>.gitignore</code> templates?
**A:** Please submit all new templates to [@dvcs/gitignore](https://github.com/dvcs/gitignore).
**A:** Please submit all new templates to [@toptal/gitignore](https://github.com/toptal/gitignore).

**Q:** How do I suggest modifications to existing `.gitignore` templates?
**A:** Modifictions should come in the form of pull requests at [@dvcs/gitignore](https://github.com/dvcs/gitignore).
**A:** Modifictions should come in the form of pull requests at [@toptal/gitignore](https://github.com/toptal/gitignore).

**Q:** Why don't Gitignore.io's templates don't look exactly like the templates on [@github/gitignore](https://github.com/github/gitignore)?
**A:** Gitignore.io tried to maintain parity with [@github/gitignore](https://github.com/github/gitignore), but GitHub's template list doesn't include many languages, operating systems, and IDE's that developers use. Gitignore.io's template list has over 100 more templates than GitHub's.

**Q:** Why is my local site empty?
**A:** When the repository is cloned, the `--recursive` flag is necessary. gitignore.io uses @dvcs/gitignore as it's data source. If the repo isn't cloned recursively, templates will be missing.
**A:** When the repository is cloned, the `--recursive` flag is necessary. gitignore.io uses [@toptal/gitignore](https://github.com/toptal/gitignore) as its data source. If the repo isn't cloned recursively, templates will be missing.

## Issue

Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,12 @@ $RECYCLE.BIN/

cobertura.xml
# End of https://www.gitignore.io/api/macos,linux,windows,vapor


node_modules/
*.swp
yarn-error.log
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.pnp.*
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "gitignore"]
path = gitignore
url = https://github.com/dvcs/gitignore.git
url = https://github.com/toptal/gitignore.git
36 changes: 0 additions & 36 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .travis/update-submodule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pwd
if [[ `git status --porcelain` ]]; then
echo "status: Updating templates"
git add .
git commit -m "Upading templates from https://github.com/dvcs/gitignore"
git commit -m "Upading templates from https://github.com/toptal/gitignore"
git push origin master
else
echo "status: No updates"
Expand Down
18 changes: 8 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
FROM vapor/vapor:1.0.9-xenial

FROM swift:4.1
WORKDIR /app

COPY ./ ./

RUN vapor build

ADD . ./
RUN git submodule update --init --recursive
RUN swift package clean
RUN swift build -c release
RUN mkdir /app/bin
RUN mv `swift build -c release --show-bin-path` /app/bin
EXPOSE 8080

# CMD vapor run

ENTRYPOINT ./bin/release/Run serve -e prod -b 0.0.0.0
Loading

0 comments on commit 67b534c

Please sign in to comment.