summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2016-05-09 18:00:28 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2016-05-09 18:00:28 +0200
commitf1479b56b71bef63517b90fcde99e6508e9c54af (patch)
tree4e426c2b25b1cfb498b452576d5b1b54266d2034 /Gemfile.lock
parent8dd2188b8367ad18bf005c855ef55f001a0b5fd1 (diff)
downloadgitlab-ce-f1479b56b71bef63517b90fcde99e6508e9c54af.tar.gz
Remove the annotate gem and delete old annotations
In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
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