Merge branch 'master' into stable

Dmitriy Zaporozhets
2 parents 6dd47c59 923eb89c
Showing 7 changed files with 33 additions and 26 deletions Show diff stats
app/views/events/_event_last_push.html.haml
config/initializers/4_resque.rb
config/initializers/4_resque_queues.rb
config/initializers/resque.rb
config/initializers/resque_authentication.rb
config/initializers/resque_mailer.rb
features/steps/dashboard/dashboard.rb
@@ -2,7 +2,7 @@
   .event_lp
     %div
       = image_tag gravatar_icon(event.author_email), class: "avatar"
-      %span Your pushed to
+      %span You pushed to
       = event.ref_type
       = link_to project_commits_path(event.project, ref: event.ref_name) do
         %strong= truncate(event.ref_name, length: 28)
@@ -0,0 +1,31 @@
+# Custom Redis configuration
+rails_root  = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
+rails_env   = ENV['RAILS_ENV'] || 'development'
+config_file = File.join(rails_root, 'config', 'resque.yml')
+
+if File.exists?(config_file)
+  resque_config = YAML.load_file(config_file)
+  Resque.redis = resque_config[rails_env]
+end
+
+# Queues
+Resque.watch_queue(PostReceive.instance_variable_get("@queue"))
+
+# Authentication
+require 'resque/server'
+class Authentication
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    account = env['warden'].authenticate!(:database_authenticatable, :rememberable, scope: :user)
+    raise "Access denied" if !account.admin?
+    @app.call(env)
+  end
+end
+
+Resque::Server.use Authentication
+
+# Mailer
+Resque::Mailer.excluded_environments = []
@@ -1 +0,0 @@
-Resque.watch_queue(PostReceive.instance_variable_get("@queue"))
@@ -1,8 +0,0 @@
-rails_root  = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
-rails_env   = ENV['RAILS_ENV'] || 'development'
-config_file = File.join(rails_root, 'config', 'resque.yml')
-
-if File.exists?(config_file)
-  resque_config = YAML.load_file(config_file)
-  Resque.redis = resque_config[rails_env]
-end
@@ -1,14 +0,0 @@
-require 'resque/server'
-class Authentication
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    account = env['warden'].authenticate!(:database_authenticatable, :rememberable, scope: :user)
-    raise "Access denied" if !account.admin?
-    @app.call(env)
-  end
-end
-
-Resque::Server.use Authentication
 \ No newline at end of file
@@ -1 +0,0 @@
-Resque::Mailer.excluded_environments = []
@@ -16,7 +16,7 @@ class Dashboard &lt; Spinach::FeatureSteps
   end
  
   Then 'I should see last push widget' do
-    page.should have_content "Your pushed to branch new_design"
+    page.should have_content "You pushed to branch new_design"
     page.should have_link "Create Merge Request"
   end
...	...	@@ -2,7 +2,7 @@
2	2	.event_lp
3	3	%div
4	4	= image_tag gravatar_icon(event.author_email), class: "avatar"
5		- %span Your pushed to
	5	+ %span You pushed to
6	6	= event.ref_type
7	7	= link_to project_commits_path(event.project, ref: event.ref_name) do
8	8	%strong= truncate(event.ref_name, length: 28)
...	...
...	...	@@ -0,0 +1,31 @@
	1	+# Custom Redis configuration
	2	+rails_root = ENV['RAILS_ROOT'] \|\| File.dirname(__FILE__) + '/../..'
	3	+rails_env = ENV['RAILS_ENV'] \|\| 'development'
	4	+config_file = File.join(rails_root, 'config', 'resque.yml')
	5	+
	6	+if File.exists?(config_file)
	7	+ resque_config = YAML.load_file(config_file)
	8	+ Resque.redis = resque_config[rails_env]
	9	+end
	10	+
	11	+# Queues
	12	+Resque.watch_queue(PostReceive.instance_variable_get("@queue"))
	13	+
	14	+# Authentication
	15	+require 'resque/server'
	16	+class Authentication
	17	+ def initialize(app)
	18	+ @app = app
	19	+ end
	20	+
	21	+ def call(env)
	22	+ account = env['warden'].authenticate!(:database_authenticatable, :rememberable, scope: :user)
	23	+ raise "Access denied" if !account.admin?
	24	+ @app.call(env)
	25	+ end
	26	+end
	27	+
	28	+Resque::Server.use Authentication
	29	+
	30	+# Mailer
	31	+Resque::Mailer.excluded_environments = []
...	...
...	...	@@ -1 +0,0 @@
1		-Resque.watch_queue(PostReceive.instance_variable_get("@queue"))
...	...	@@ -1,8 +0,0 @@
1		-rails_root = ENV['RAILS_ROOT'] \|\| File.dirname(__FILE__) + '/../..'
2		-rails_env = ENV['RAILS_ENV'] \|\| 'development'
3		-config_file = File.join(rails_root, 'config', 'resque.yml')
4		-
5		-if File.exists?(config_file)
6		- resque_config = YAML.load_file(config_file)
7		- Resque.redis = resque_config[rails_env]
8		-end
...	...	@@ -1,14 +0,0 @@
1		-require 'resque/server'
2		-class Authentication
3		- def initialize(app)
4		- @app = app
5		- end
6		-
7		- def call(env)
8		- account = env['warden'].authenticate!(:database_authenticatable, :rememberable, scope: :user)
9		- raise "Access denied" if !account.admin?
10		- @app.call(env)
11		- end
12		-end
13		-
14		-Resque::Server.use Authentication
15	0	\ No newline at end of file
...	...	@@ -1 +0,0 @@
1		-Resque::Mailer.excluded_environments = []
...	...	@@ -16,7 +16,7 @@ class Dashboard < Spinach::FeatureSteps
16	16	end
17	17
18	18	Then 'I should see last push widget' do
19		- page.should have_content "Your pushed to branch new_design"
	19	+ page.should have_content "You pushed to branch new_design"
20	20	page.should have_link "Create Merge Request"
21	21	end
22	22
...	...