From 45ef553a404f152ca34b6f5ac20b29f30224be47 Mon Sep 17 00:00:00 2001 From: exromany Date: Mon, 18 Aug 2014 10:05:58 +0400 Subject: Update user_management.md add rails_env to commands --- doc/raketasks/user_management.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md index eb9eebb4b4a..dfd4959b22b 100644 --- a/doc/raketasks/user_management.md +++ b/doc/raketasks/user_management.md @@ -7,7 +7,7 @@ sudo gitlab-rake gitlab:import:user_to_projects[username@domain.tld] # installation from source or cookbook -bundle exec rake gitlab:import:user_to_projects[username@domain.tld] +RAILS_ENV=production bundle exec rake gitlab:import:user_to_projects[username@domain.tld] ``` ## Add all users to all projects @@ -21,7 +21,7 @@ Notes: sudo gitlab-rake gitlab:import:all_users_to_all_projects # installation from source or cookbook -bundle exec rake gitlab:import:all_users_to_all_projects +RAILS_ENV=production bundle exec rake gitlab:import:all_users_to_all_projects ``` ## Add user as a developer to all groups @@ -31,7 +31,7 @@ bundle exec rake gitlab:import:all_users_to_all_projects sudo gitlab-rake gitlab:import:user_to_groups[username@domain.tld] # installation from source or cookbook -bundle exec rake gitlab:import:user_to_groups[username@domain.tld] +RAILS_ENV=production bundle exec rake gitlab:import:user_to_groups[username@domain.tld] ``` ## Add all users to all groups @@ -45,5 +45,5 @@ Notes: sudo gitlab-rake gitlab:import:all_users_to_all_groups # installation from source or cookbook -bundle exec rake gitlab:import:all_users_to_all_groups +RAILS_ENV=production bundle exec rake gitlab:import:all_users_to_all_groups ``` -- cgit v1.2.1 From dab09316ebbef585009bf7cc33afcabec7804d64 Mon Sep 17 00:00:00 2001 From: exromany Date: Tue, 19 Aug 2014 01:07:32 +0400 Subject: move env to end of lines --- doc/raketasks/user_management.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md index dfd4959b22b..3c67753ad28 100644 --- a/doc/raketasks/user_management.md +++ b/doc/raketasks/user_management.md @@ -7,7 +7,7 @@ sudo gitlab-rake gitlab:import:user_to_projects[username@domain.tld] # installation from source or cookbook -RAILS_ENV=production bundle exec rake gitlab:import:user_to_projects[username@domain.tld] +bundle exec rake gitlab:import:user_to_projects[username@domain.tld] RAILS_ENV=production ``` ## Add all users to all projects @@ -21,7 +21,7 @@ Notes: sudo gitlab-rake gitlab:import:all_users_to_all_projects # installation from source or cookbook -RAILS_ENV=production bundle exec rake gitlab:import:all_users_to_all_projects +bundle exec rake gitlab:import:all_users_to_all_projects RAILS_ENV=production ``` ## Add user as a developer to all groups @@ -31,7 +31,7 @@ RAILS_ENV=production bundle exec rake gitlab:import:all_users_to_all_projects sudo gitlab-rake gitlab:import:user_to_groups[username@domain.tld] # installation from source or cookbook -RAILS_ENV=production bundle exec rake gitlab:import:user_to_groups[username@domain.tld] +bundle exec rake gitlab:import:user_to_groups[username@domain.tld] RAILS_ENV=production ``` ## Add all users to all groups @@ -45,5 +45,5 @@ Notes: sudo gitlab-rake gitlab:import:all_users_to_all_groups # installation from source or cookbook -RAILS_ENV=production bundle exec rake gitlab:import:all_users_to_all_groups +bundle exec rake gitlab:import:all_users_to_all_groups RAILS_ENV=production ``` -- cgit v1.2.1 From a391cd21d74140b8d5a253f64b66f5d313304f58 Mon Sep 17 00:00:00 2001 From: Tamer Sherif Date: Sun, 14 Sep 2014 12:31:32 +0300 Subject: Fix grammatical error in 'not merged changes' msg --- app/views/projects/merge_requests/show/_state_widget.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml index c30310f1258..a5f8af89d1a 100644 --- a/app/views/projects/merge_requests/show/_state_widget.html.haml +++ b/app/views/projects/merge_requests/show/_state_widget.html.haml @@ -13,7 +13,7 @@ %h4 Closed by #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)} #{time_ago_with_tooltip(@merge_request.closed_event.created_at)} - %p Changes was not merged into target branch + %p Changes were not merged into target branch - if @merge_request.merged? %h4 -- cgit v1.2.1