Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-27

# Conflicts:
#	app/views/help/index.html.haml

[ci skip]

app/views/help/index.html.haml

@@ -6,6 +6,7 @@
   %hr
 
 %h1
+<<<<<<< HEAD
 GitLab
 Enterprise Edition
 - if user_signed_in?
@@ -13,6 +14,15 @@ Enterprise Edition
   %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ee', Gitlab::REVISION)
   - if current_application_settings.version_check_enabled
     = version_status_badge
+=======
+  GitLab
+  Community Edition
+  - if user_signed_in?
+    %span= Gitlab::VERSION
+    %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ce', Gitlab::REVISION)
+    = version_status_badge
+  %hr
+>>>>>>> upstream/master
 
 - unless current_application_settings.help_page_hide_commercial_content?
   %p.slead

spec/requests/api/issues_spec.rb

@@ -1445,7 +1445,7 @@ describe API::Issues, :mailer do
 
     context 'when source project does not exist' do
       it 'returns 404 when trying to move an issue' do
-        post api("/projects/123/issues/#{issue.iid}/move", user),
+        post api("/projects/12345/issues/#{issue.iid}/move", user),
                  to_project_id: target_project.id
 
         expect(response).to have_gitlab_http_status(404)
@@ -1456,7 +1456,7 @@ describe API::Issues, :mailer do
     context 'when target project does not exist' do
       it 'returns 404 when trying to move an issue' do
         post api("/projects/#{project.id}/issues/#{issue.iid}/move", user),
-                 to_project_id: 123
+                 to_project_id: 12345
 
         expect(response).to have_gitlab_http_status(404)
       end