summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-29 03:32:28 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-29 03:32:28 -0700
commitccab346a7899d34ffcdd0169dbc87450eb2aca59 (patch)
tree10987cdaad7415a1fb1826f4722247c7c5c2c474 /Gemfile.lock
parent5f3a7587215a4ff25d3fca0e0aded3b76bc9ac57 (diff)
parent7277280d5f276fe97ff97276ce20400bcb5db07c (diff)
downloadgitlab-ce-ccab346a7899d34ffcdd0169dbc87450eb2aca59.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
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 340e3818654..ed8663b358b 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)