Add latest changes from gitlab-org/gitlab@master

doc/ci/ci_cd_for_external_repos/github_integration.md

@@ -26,7 +26,7 @@ To perform a one-off authorization with GitHub to grant GitLab access your
 repositories:
 
 1. Open <https://github.com/settings/tokens/new> to create a **Personal Access
-   Token**. This token with be used to access your repository and push commit
+   Token**. This token will be used to access your repository and push commit
    statuses to GitHub.
 
    The `repo` and `admin:repo_hook` should be enable to allow GitLab access to

doc/development/documentation/workflow.md

@@ -208,7 +208,7 @@ code reviewer have ensured:
 Documentation [is required](../contributing/merge_request_workflow.html#definition-of-done) for a
 milestone when:
 
-- A new or enhanced feature is shipped that impacts the user of administrator experience.
+- A new or enhanced feature is shipped that impacts the user or administrator experience.
 - There are changes to the UI or API.
 - A process, workflow, or previously documented feature is changed.
 - A feature is deprecated or removed.

doc/user/project/merge_requests/code_quality.md

@@ -66,6 +66,18 @@ will scan your source code for code quality issues. The report will be saved as
 that you can later download and analyze. Due to implementation limitations we always
 take the latest Code Quality artifact available.
 
+By default, report artifacts are not downloadable. If you need them downloadable on the
+job details page, you can add `gl-code-quality-report.json` to the artifact paths like so:
+
+```yaml
+include:
+  - template: Code-Quality.gitlab-ci.yml
+
+code_quality:
+  artifacts:
+    paths: [gl-code-quality-report.json]
+```
+
 The included `code_quality` job is running in the `test` stage, so it needs to be included in your CI config, like so:
 
 ```yaml

spec/controllers/registrations_controller_spec.rb

@@ -30,6 +30,7 @@ describe RegistrationsController do
 
       it 'renders new template and sets the resource variable' do
         expect(subject).to render_template(:new)
+        expect(response).to have_gitlab_http_status(200)
         expect(assigns(:resource)).to be_a(User)
       end
     end
@@ -47,6 +48,7 @@ describe RegistrationsController do
 
       it 'renders new template and sets the resource variable' do
         subject
+        expect(response).to have_gitlab_http_status(302)
         expect(response).to redirect_to(new_user_session_path(anchor: 'register-pane'))
       end
     end

spec/requests/api/users_spec.rb

@@ -635,32 +635,6 @@ describe API::Users do
     end
   end
 
-  describe "GET /users/sign_up" do
-    context 'when experimental signup_flow is active' do
-      before do
-        stub_experiment_for_user(signup_flow: true)
-      end
-
-      it "shows sign up page" do
-        get "/users/sign_up"
-        expect(response).to have_gitlab_http_status(200)
-        expect(response).to render_template(:new)
-      end
-    end
-
-    context 'when experimental signup_flow is not active' do
-      before do
-        stub_experiment_for_user(signup_flow: false)
-      end
-
-      it "redirects to sign in page" do
-        get "/users/sign_up"
-        expect(response).to have_gitlab_http_status(302)
-        expect(response).to redirect_to(new_user_session_path(anchor: 'register-pane'))
-      end
-    end
-  end
-
   describe "PUT /users/:id" do
     let!(:admin_user) { create(:admin) }