summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-01 08:14:05 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-01 08:14:05 +0000
commitac6180bcb04d3f7486b87bf1a950e8250c6e27a5 (patch)
tree5143ef5d9da3628c35ac2e5fe520d9e118abe51d /Gemfile.lock
parent9ffabc6d7ed0c71d133a29671b50795fb621522c (diff)
parent775aa5ba7ce5ef335bcae81bbc2bf8b7b1321303 (diff)
downloadgitlab-ce-ac6180bcb04d3f7486b87bf1a950e8250c6e27a5.tar.gz
Merge branch 'rack_attack' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 97a8129ed3d..59d67d4efe9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -334,6 +334,8 @@ GEM
rack (1.4.5)
rack-accept (0.4.5)
rack (>= 0.4)
+ rack-attack (2.2.1)
+ rack
rack-cache (1.2)
rack (>= 0.4)
rack-mini-profiler (0.1.31)
@@ -608,6 +610,7 @@ DEPENDENCIES
poltergeist (~> 1.4.1)
pry
quiet_assets (~> 1.0.1)
+ rack-attack
rack-mini-profiler
rails (= 3.2.13)
rails-dev-tweaks