diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-11 03:23:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-11 03:23:03 +0000 |
| commit | ca7fa51065ee512cb103b239de3d4b9ee9e51397 (patch) | |
| tree | d0f34aa361bb77042cc5de300c99b180690f464b | |
| parent | 27e4dd3829ecbdc1734ba2d27258dc0c51ac6032 (diff) | |
| parent | a7e1638b430627133a33986b8a8283891431567a (diff) | |
| download | gitlab-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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -239,7 +239,7 @@ group :development do gem "foreman" gem 'brakeman', '~> 3.2.0', require: false - gem "annotate", "~> 2.6.0" + gem "annotate", "~> 2.7.0" gem "letter_opener", '~> 1.1.2' gem 'quiet_assets', '~> 1.0.2' gem 'rerun', '~> 0.11.0' 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) |