diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-10 13:58:10 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-10 13:58:10 -0500 |
| commit | db25c17036b47cc4ee0bd08b7dc70def25d9a3c9 (patch) | |
| tree | e3cbcf3f34bf1ff043d5947bc0da434da8a4c0ca /Gemfile.lock | |
| parent | 74520f23db51c95b4aea8856fb51c4246785f776 (diff) | |
| parent | e3911a1896d8725f7b739929b7de1ab09917eed5 (diff) | |
| download | gitlab-ce-db25c17036b47cc4ee0bd08b7dc70def25d9a3c9.tar.gz | |
Merge remote-tracking branch 'origin/master' into send-incremental-build-log
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fe083c2b566..86b9142ef27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,9 +51,6 @@ GEM activerecord (>= 3.0) akismet (2.0.0) allocations (1.0.4) - annotate (2.7.0) - activerecord (>= 3.2, < 6.0) - rake (~> 10.4) arel (6.0.3) asana (0.4.0) faraday (~> 0.9) @@ -893,7 +890,6 @@ DEPENDENCIES after_commit_queue akismet (~> 2.0) allocations (~> 1.0) - annotate (~> 2.7.0) asana (~> 0.4.0) asciidoctor (~> 1.5.2) attr_encrypted (~> 1.3.4) @@ -1061,4 +1057,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.12.1 + 1.12.3 |