Merge branch 'tests_limitation_skip' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 4525fc84 bb71c5d8
Showing 1 changed file with 5 additions and 2 deletions Show diff stats
config/initializers/rack_attack.rb.example
@@ -7,6 +7,9 @@ paths_to_be_protected = [
   "#{Rails.application.config.relative_url_root}/users/sign_in",
   "#{Rails.application.config.relative_url_root}/users"
 ]
-Rack::Attack.throttle('protected paths', limit: 6, period: 60.seconds) do |req|
-  req.ip if paths_to_be_protected.include?(req.path) && req.post?
+
+unless Rails.env.test?
+  Rack::Attack.throttle('protected paths', limit: 6, period: 60.seconds) do |req|
+    req.ip if paths_to_be_protected.include?(req.path) && req.post?
+  end
 end
...	...	@@ -7,6 +7,9 @@ paths_to_be_protected = [
7	7	"#{Rails.application.config.relative_url_root}/users/sign_in",
8	8	"#{Rails.application.config.relative_url_root}/users"
9	9	]
10		-Rack::Attack.throttle('protected paths', limit: 6, period: 60.seconds) do \|req\|
11		- req.ip if paths_to_be_protected.include?(req.path) && req.post?
	10	+
	11	+unless Rails.env.test?
	12	+ Rack::Attack.throttle('protected paths', limit: 6, period: 60.seconds) do \|req\|
	13	+ req.ip if paths_to_be_protected.include?(req.path) && req.post?
	14	+ end
12	15	end
...	...