diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-15 13:45:56 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-15 13:45:56 +0200 |
| commit | 25b0968846700d762b034fdb26c9beab461a4b1c (patch) | |
| tree | 76601b7d92d9b20b54835ab29f3b0425811bc976 | |
| parent | 940c4c101cc7d5f95ed31a30f213d7090a20d67d (diff) | |
| parent | d74673fd435e5238b5fb8d29735f31175c71e45f (diff) | |
| download | gitlab-ce-25b0968846700d762b034fdb26c9beab461a4b1c.tar.gz | |
Merge pull request #9277 from jvanbaarsen/pr/9061
Ensure that the first added admin performs repository imports
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/import.rake | 2 |
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, |