Automatic merge of gitlab-org/gitlab-ce master

app/controllers/concerns/import_url_params.rb

@@ -2,6 +2,8 @@
 
 module ImportUrlParams
   def import_url_params
+    return {} unless params.dig(:project, :import_url).present?
+
     { import_url: import_params_to_full_url(params[:project]) }
   end
 

changelogs/unreleased/sh-fix-import-url-update.yml

+---
+title: Fix project settings not being able to update
+merge_request: 29097
+author:
+type: fixed

doc/api/snippets.md

@@ -165,15 +165,15 @@ Parameters:
 |:--------------|:-------|:---------|:---------------------------------------------------|
 | `title`       | string | yes      | Title of a snippet.                                |
 | `file_name`   | string | yes      | Name of a snippet file.                            |
-| `content`     | string | yes      | Content of a snippet.                              |
+| `code`     | string | yes      | Content of a snippet.                              |
 | `description` | string | no       | Description of a snippet.                          |
-| `visibility`  | string | no       | Snippet's [visibility](#snippet-visibility-level). |
+| `visibility`  | string | yes       | Snippet's [visibility](#snippet-visibility-level). |
 
 Example request:
 
 ```sh
 curl --request POST \
-     --data '{"title": "This is a snippet", "content": "Hello world", "description": "Hello World snippet", "file_name": "test.txt", "visibility": "internal" }' \
+     --data '{"title": "This is a snippet", "code": "Hello world", "description": "Hello World snippet", "file_name": "test.txt", "visibility": "internal" }' \
      --header 'Content-Type: application/json' \
      --header "PRIVATE-TOKEN: valid_api_token" \
      https://gitlab.example.com/api/v4/snippets
@@ -222,14 +222,14 @@ Parameters:
 | `title`       | string  | no       | Title of a snippet.                                |
 | `file_name`   | string  | no       | Name of a snippet file.                            |
 | `description` | string  | no       | Description of a snippet.                          |
-| `content`     | string  | no       | Content of a snippet.                              |
+| `code`     | string  | no       | Content of a snippet.                              |
 | `visibility`  | string  | no       | Snippet's [visibility](#snippet-visibility-level). |
 
 Example request:
 
 ```sh
 curl --request PUT \
-     --data '{"title": "foo", "content": "bar"}' \
+     --data '{"title": "foo", "code": "bar"}' \
      --header 'Content-Type: application/json' \
      --header "PRIVATE-TOKEN: valid_api_token" \
      https://gitlab.example.com/api/v4/snippets/1

doc/raketasks/backup_restore.md

@@ -917,9 +917,9 @@ backup beforehand.
 
 1. Clear all the tokens for projects, groups, and the whole instance:
 
-CAUTION: **Caution:**
-The last UPDATE operation will stop the runners being able to pick up
-new jobs. You must register new runners.
+    CAUTION: **Caution:**
+    The last UPDATE operation will stop the runners being able to pick up
+    new jobs. You must register new runners.
 
     ```sql
     -- Clear project tokens

spec/controllers/concerns/import_url_params_spec.rb

@@ -8,6 +8,18 @@ describe ImportUrlParams do
     controller.import_url_params
   end
 
+  context 'empty URL' do
+    let(:params) do
+      ActionController::Parameters.new(project: {
+        title: 'Test'
+      })
+    end
+
+    it 'returns empty hash' do
+      expect(import_url_params).to eq({})
+    end
+  end
+
   context 'url and password separately provided' do
     let(:params) do
       ActionController::Parameters.new(project: {