diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-15 10:20:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-15 10:20:43 +0300 |
| commit | 09b23228dfa2242e4123e10091f8a0194ecdc3de (patch) | |
| tree | 7a4e9055af9eb248cdcf2568c0392740d6c828bf | |
| parent | 79190fe06be1671eed82c0b463c27c35224fa0d3 (diff) | |
| parent | 67cf376d97372a9c175f09a12a8ced9c0f5c036f (diff) | |
| download | gitlab-ce-09b23228dfa2242e4123e10091f8a0194ecdc3de.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/views/projects/merge_requests/show/_state_widget.html.haml | 2 | ||||
| -rw-r--r-- | doc/raketasks/user_management.md | 8 |
2 files changed, 5 insertions, 5 deletions
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 diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md index eb9eebb4b4a..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 -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 -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 @@ 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] +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 -bundle exec rake gitlab:import:all_users_to_all_groups +bundle exec rake gitlab:import:all_users_to_all_groups RAILS_ENV=production ``` |