diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-14 17:10:11 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-14 17:10:11 +0000 |
| commit | 9be9328bc2a9e9da71d77a1fbcf76336e89e53f1 (patch) | |
| tree | 1b870382fcc00abe0720c02934c5519e97a5a16b | |
| parent | 9c10e9d4cac101008b63d3f8ff30ecc7e0261897 (diff) | |
| parent | c578a6b90d80f5990246cbe69f24fc123f393145 (diff) | |
| download | gitlab-ce-9be9328bc2a9e9da71d77a1fbcf76336e89e53f1.tar.gz | |
Merge branch 'update-acts-as-taggable-on' into 'master'
Update acts-as-taggable-on to 5.0
See merge request gitlab-org/gitlab-ce!17689
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -152,7 +152,7 @@ end gem 'state_machines-activerecord', '~> 0.4.0' # Issue tags -gem 'acts-as-taggable-on', '~> 4.0' +gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock index fa55f14728e..e25d407cbce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,8 +40,8 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - acts-as-taggable-on (4.0.0) - activerecord (>= 4.0) + acts-as-taggable-on (5.0.0) + activerecord (>= 4.2.8) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -414,7 +414,7 @@ GEM httparty (0.15.7) multi_xml (>= 0.5.2) httpclient (2.8.2) - i18n (0.9.1) + i18n (0.9.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) influxdb (0.2.3) @@ -932,7 +932,7 @@ GEM truncato (0.7.10) htmlentities (~> 4.3.1) nokogiri (~> 1.8.0, >= 1.7.0) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -993,7 +993,7 @@ DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) activerecord_sane_schema_dumper (= 0.2) - acts-as-taggable-on (~> 4.0) + acts-as-taggable-on (~> 5.0) addressable (~> 2.5.2) akismet (~> 2.0) allocations (~> 1.0) |