diff options
author | Nihad Abbasov <narkoz.2008@gmail.com> | 2015-03-29 05:04:45 +0500 |
---|---|---|
committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2015-03-29 05:04:45 +0500 |
commit | 7277280d5f276fe97ff97276ce20400bcb5db07c (patch) | |
tree | 4bada3d2619c7c1f37930427549d9bcad7a03e4f /Gemfile.lock | |
parent | db948ff3d6a72620391c7cb0f169334cef0438c7 (diff) | |
parent | be65373fc78ea887aa2d59ee49ae8bb14c64b084 (diff) | |
download | gitlab-ce-7277280d5f276fe97ff97276ce20400bcb5db07c.tar.gz |
Merge pull request #9047 from NARKOZ/patch-7
update acts-as-taggable-on
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7da4d3c3583..5adaffb5dc8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,8 +33,8 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - acts-as-taggable-on (2.4.1) - rails (>= 3, < 5) + acts-as-taggable-on (3.5.0) + activerecord (>= 3.2, < 5) addressable (2.3.5) annotate (2.6.0) activerecord (>= 2.3.0) @@ -662,7 +662,7 @@ PLATFORMS DEPENDENCIES RedCloth ace-rails-ap - acts-as-taggable-on + acts-as-taggable-on (~> 3.4) addressable annotate (~> 2.6.0.beta2) asana (~> 0.0.6) |