Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ src/mochiweb/
src/oauth/
src/rebar/
src/snappy/
src/triq/
tmp/

src/couch/*.o
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ DESTDIR=

# Rebar options
apps=
skip_deps=folsom,meck,mochiweb,proper,snappy
skip_deps=folsom,meck,mochiweb,triq,snappy
suites=
tests=

Expand Down
2 changes: 1 addition & 1 deletion Makefile.win
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ DESTDIR=

# Rebar options
apps=
skip_deps=folsom,meck,mochiweb,proper,snappy
skip_deps=folsom,meck,mochiweb,triq,snappy
suites=
tests=

Expand Down
5 changes: 3 additions & 2 deletions rebar.config.script
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ DepDescs = [
{mochiweb, "mochiweb", {tag, "v2.17.0"}},
{meck, "meck", {tag, "0.8.8"}},
{bcrypt, {url, "https://github.com/apache/couchdb-erlang-bcrypt"},
{tag, "1.0.2"}}

{tag, "1.0.2"}},
{triq, {url, "https://gitlab.com/triq/triq.git"},
"79bd272025434e152745067c36350faa7274c653"}
],


Expand Down
Loading