Merge branch 'master' of github.com:gitlabhq/gitlabhq

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

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
 ```