Merge branch 'master' into 42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation

13 files changed, 27 insertions, 55 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ad603fdc75..c3bb93fbe3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.4.4 (2018-02-16)
+
+### Security (1 change)
+
+- Update nokogiri to 1.8.2. !16807
+
+### Fixed (9 changes)
+
+- Fix 500 error when loading a merge request with an invalid comment. !16795
+- Cleanup new branch/merge request form in issues. !16854
+- Fix GitLab import leaving group_id on ProjectLabel. !16877
+- Fix forking projects when no restricted visibility levels are defined applicationwide. !16881
+- Resolve PrepareUntrackedUploads PostgreSQL syntax error. !17019
+- Fixed error 500 when removing an identity with synced attributes and visiting the profile page. !17054
+- Validate user namespace before saving so that errors persist on model.
+- LDAP Person no longer throws exception on invalid entry.
+- Fix JIRA not working when a trailing slash is included.
+
+
 ## 10.4.3 (2018-02-05)
 
 ### Security (4 changes)
diff --git a/changelogs/unreleased/42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass.yml b/changelogs/unreleased/42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass.yml
deleted file mode 100644
index 64340ab08cd..00000000000
--- a/changelogs/unreleased/42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix 500 error when loading a merge request with an invalid comment
-merge_request: 16795
-author:
-type: fixed
diff --git a/changelogs/unreleased/42591-update-nokogiri.yml b/changelogs/unreleased/42591-update-nokogiri.yml
deleted file mode 100644
index 5f9587d2d92..00000000000
--- a/changelogs/unreleased/42591-update-nokogiri.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update nokogiri to 1.8.2
-merge_request: 16807
-author:
-type: security
diff --git a/changelogs/unreleased/42696-gitlab-import-leaves-group_id-on-projectlabel.yml b/changelogs/unreleased/42696-gitlab-import-leaves-group_id-on-projectlabel.yml
deleted file mode 100644
index c46cc86c99b..00000000000
--- a/changelogs/unreleased/42696-gitlab-import-leaves-group_id-on-projectlabel.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix GitLab import leaving group_id on ProjectLabel
-merge_request: 16877
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-fix-500-on-fork-without-restricted-visibility-levels.yml b/changelogs/unreleased/bvl-fix-500-on-fork-without-restricted-visibility-levels.yml
deleted file mode 100644
index 378f0ef7ce9..00000000000
--- a/changelogs/unreleased/bvl-fix-500-on-fork-without-restricted-visibility-levels.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix forking projects when no restricted visibility levels are defined applicationwide
-merge_request: 16881
-author:
-type: fixed
diff --git a/changelogs/unreleased/dm-user-namespace-route-path-validation.yml b/changelogs/unreleased/dm-user-namespace-route-path-validation.yml
deleted file mode 100644
index 36615e5b976..00000000000
--- a/changelogs/unreleased/dm-user-namespace-route-path-validation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Validate user namespace before saving so that errors persist on model
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/fj-37528-error-after-disabling-ldap.yml b/changelogs/unreleased/fj-37528-error-after-disabling-ldap.yml
deleted file mode 100644
index 1e35f2b537d..00000000000
--- a/changelogs/unreleased/fj-37528-error-after-disabling-ldap.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fixed error 500 when removing an identity with synced attributes and visiting
-  the profile page
-merge_request: 17054
-author:
-type: fixed
diff --git a/changelogs/unreleased/mk-fix-no-untracked-upload-files-error.yml b/changelogs/unreleased/mk-fix-no-untracked-upload-files-error.yml
deleted file mode 100644
index fddfba94192..00000000000
--- a/changelogs/unreleased/mk-fix-no-untracked-upload-files-error.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Resolve PrepareUntrackedUploads PostgreSQL syntax error
-merge_request: 17019
-author:
-type: fixed
diff --git a/changelogs/unreleased/remove_ldap_person_validation.yml b/changelogs/unreleased/remove_ldap_person_validation.yml
deleted file mode 100644
index da7f0a52886..00000000000
--- a/changelogs/unreleased/remove_ldap_person_validation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: LDAP Person no longer throws exception on invalid entry
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-jira-trailing-slash.yml b/changelogs/unreleased/sh-fix-jira-trailing-slash.yml
deleted file mode 100644
index 786f6cd3727..00000000000
--- a/changelogs/unreleased/sh-fix-jira-trailing-slash.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix JIRA not working when a trailing slash is included
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/winh-new-branch-dropdown-style.yml b/changelogs/unreleased/winh-new-branch-dropdown-style.yml
deleted file mode 100644
index 007e9e9f453..00000000000
--- a/changelogs/unreleased/winh-new-branch-dropdown-style.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Cleanup new branch/merge request form in issues
-merge_request: 16854
-author:
-type: fixed
diff --git a/lib/api/project_import.rb b/lib/api/project_import.rb
index c32e2f26ae3..a509c1f32c1 100644
--- a/lib/api/project_import.rb
+++ b/lib/api/project_import.rb
@@ -41,8 +41,12 @@ module API
                       current_user.namespace
                     end
 
-        project_params = import_params.merge(namespace_id: namespace.id,
-                                             file: import_params[:file]['tempfile'])
+        project_params = {
+            path: import_params[:path],
+            namespace_id: namespace.id,
+            file: import_params[:file]['tempfile']
+        }
+
         project = ::Projects::GitlabProjectsImportService.new(current_user, project_params).execute
 
         render_api_error!(project.errors.full_messages&.first, 400) unless project.saved?
diff --git a/spec/requests/api/project_import_spec.rb b/spec/requests/api/project_import_spec.rb
index eabf9095c13..987f6e26971 100644
--- a/spec/requests/api/project_import_spec.rb
+++ b/spec/requests/api/project_import_spec.rb
@@ -42,7 +42,7 @@ describe API::ProjectImport do
 
     it 'schedules an import at the user namespace level' do
       expect_any_instance_of(Project).not_to receive(:import_schedule)
-      expect(Gitlab::ImportExport::ProjectCreator).not_to receive(:new)
+      expect(::Projects::CreateService).not_to receive(:new)
 
       post api('/projects/import', user), namespace: 'nonexistent', path: 'test-import2', file: fixture_file_upload(file)
 
@@ -73,7 +73,7 @@ describe API::ProjectImport do
 
     def stub_import(namespace)
       expect_any_instance_of(Project).to receive(:import_schedule)
-      expect(Gitlab::ImportExport::ProjectCreator).to receive(:new).with(namespace.id, any_args).and_call_original
+      expect(::Projects::CreateService).to receive(:new).with(user, hash_including(namespace_id: namespace.id)).and_call_original
     end
   end