summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFotis Gimian <fgimiansoftware@gmail.com>2015-03-31 20:25:50 +1100
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-05-15 13:01:10 +0200
commitd74673fd435e5238b5fb8d29735f31175c71e45f (patch)
tree489098c476f2de6543ffc7a3de2b401a0dc4e49a
parentbe969bb4deb0d0d63156720d94b0cbf00a5ded11 (diff)
downloadgitlab-ce-d74673fd435e5238b5fb8d29735f31175c71e45f.tar.gz
Ensure that the first added admin performs repository imports
-rw-r--r--CHANGELOG1
-rw-r--r--lib/tasks/gitlab/import.rake2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f92f486064f..ade877feb9a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -66,6 +66,7 @@ v 7.11.0 (unreleased)
- Add style for <kbd> element in markdown
- Spin spinner icon next to "Checking for CI status..." on MR page.
- Fix reference links in dashboard activity and ATOM feeds.
+ - Ensure that the first added admin performs repository imports
v 7.10.2
- Fix CI links on MR page
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index 20abb2fa500..7c98ad3144f 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -35,7 +35,7 @@ namespace :gitlab do
if project
puts " * #{project.name} (#{repo_path}) exists"
else
- user = User.admins.first
+ user = User.admins.reorder("id").first
project_params = {
name: name,