summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-04-11 03:23:03 +0000
committerRobert Speicher <robert@gitlab.com>2016-04-11 03:23:03 +0000
commitca7fa51065ee512cb103b239de3d4b9ee9e51397 (patch)
treed0f34aa361bb77042cc5de300c99b180690f464b /Gemfile.lock
parent27e4dd3829ecbdc1734ba2d27258dc0c51ac6032 (diff)
parenta7e1638b430627133a33986b8a8283891431567a (diff)
downloadgitlab-ce-ca7fa51065ee512cb103b239de3d4b9ee9e51397.tar.gz
Merge branch 'upgrade-annotate' into 'master'
Upgrade annotate from 2.6.10 to 2.7.0 We don’t have any tests for this, so no need to run them. [ci skip] Includes compatibility with Rails 5. Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286. See merge request !3645
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index df0d848af4c..9da44a46583 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,8 +51,8 @@ GEM
activerecord (>= 3.0)
akismet (2.0.0)
allocations (1.0.4)
- annotate (2.6.10)
- activerecord (>= 3.2, <= 4.3)
+ annotate (2.7.0)
+ activerecord (>= 3.2, < 6.0)
rake (~> 10.4)
arel (6.0.3)
asana (0.4.0)
@@ -888,7 +888,7 @@ DEPENDENCIES
after_commit_queue
akismet (~> 2.0)
allocations (~> 1.0)
- annotate (~> 2.6.0)
+ annotate (~> 2.7.0)
asana (~> 0.4.0)
asciidoctor (~> 1.5.2)
attr_encrypted (~> 1.3.4)