GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2016-10-10T21:09:14Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/650[ES] Add explanation comments2016-10-10T21:09:14ZValery Sizov[ES] Add explanation comments8.11Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/676Fix broken specs and UI for protected branches.2016-10-10T21:10:04ZRubén DávilaFix broken specs and UI for protected branches.The dropdowns were not using the proper css classes and the specs were not working because they were not testing it as a multi-select dropdown
#### Before
![Screen_Shot_2016-08-21_at_12.55.20_PM](/uploads/c89080942b41182194cd94a948fc4d...The dropdowns were not using the proper css classes and the specs were not working because they were not testing it as a multi-select dropdown
#### Before
![Screen_Shot_2016-08-21_at_12.55.20_PM](/uploads/c89080942b41182194cd94a948fc4d0a/Screen_Shot_2016-08-21_at_12.55.20_PM.png)
#### After
![Screen_Shot_2016-08-21_at_12.54.19_PM](/uploads/f72c1828a87bc994e5f1f020bbe2c029/Screen_Shot_2016-08-21_at_12.54.19_PM.png)8.11Stan HuStan Huhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/679Split Koding admin/user docs2016-10-10T21:10:13ZAchilleas PipinellisSplit Koding admin/user docsFrom CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5938From CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/59388.11Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/680typo: won't -> want2016-10-10T21:10:14Zusername-removed-91802andy@onthewings.nettypo: won't -> wanthttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/690Fix CHANGELOG-EE with changes from 8.11 release.2016-10-10T21:10:44ZRubén DávilaFix CHANGELOG-EE with changes from 8.11 release.8.11Stan HuStan Huhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/691Set the correct `GL_PROTOCOL` in the environment when rebasing.2016-10-10T21:10:44ZPatricio CanoSet the correct `GL_PROTOCOL` in the environment when rebasing.@stanhu I tested the changes locally and they seem to work.
I'm not sure how to add tests for this, however.@stanhu I tested the changes locally and they seem to work.
I'm not sure how to add tests for this, however.8.11Stan HuStan Huhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/701Hide group control nav if no options present2016-10-10T21:12:53ZPhil Hughesme@iamphill.comHide group control nav if no options presentTaken from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5155Taken from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/51558.12Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/708Ensure an MR never has negative approvals left2016-10-10T21:13:03Zusername-removed-443319Ensure an MR never has negative approvals left@rspeicher this doesn't fix anything that wasn't fixed by https://gitlab.com/gitlab-org/gitlab-ee/commit/bf0996ccc2bd19639031f07141455f7198000c1f, but I figure it's worth a) being doubly sure and b) adding specs. No CHANGELOG entry for t...@rspeicher this doesn't fix anything that wasn't fixed by https://gitlab.com/gitlab-org/gitlab-ee/commit/bf0996ccc2bd19639031f07141455f7198000c1f, but I figure it's worth a) being doubly sure and b) adding specs. No CHANGELOG entry for that reason!
Closes #959.8.12Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/715API: Restore backward-compatibility for POST /projects/:id/members when membe...2016-10-10T21:13:08Zusername-removed-128633API: Restore backward-compatibility for POST /projects/:id/members when membership is lockedCloses #971.
/cc @rdavilaCloses #971.
/cc @rdavila8.11username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/796Move reply by email docs to a new location2016-10-11T13:28:05ZAchilleas PipinellisMove reply by email docs to a new locationFrom CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6517From CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/65178.13Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/797Move monitoring/ to new location2016-10-11T14:03:33ZAchilleas PipinellisMove monitoring/ to new locationFrom CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6518From CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/65188.13Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/798Move operations/ to new location2016-10-11T14:31:33ZAchilleas PipinellisMove operations/ to new locationFrom CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6519From CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/65198.13Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/789Merge CacheMarkdownField to EE2016-10-12T07:47:14ZNick ThomasMerge CacheMarkdownField to EEThis branch merges http://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6095 into gitlab-ee, fixing merge conflicts.
It also merges a lot of unrelated commits in, as the MR was ahead of EE's current master.
/cc @rspeicher @rymai how d...This branch merges http://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6095 into gitlab-ee, fixing merge conflicts.
It also merges a lot of unrelated commits in, as the MR was ahead of EE's current master.
/cc @rspeicher @rymai how does this look? It was a lot cleaner than I anticipated, actually.8.13Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/775Reset Jenkins password if username was left blank2016-10-13T08:50:33Zusername-removed-423915Reset Jenkins password if username was left blankSo we not only reset password if URL was changed, but also for username. Also, still require username if a new password was set.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22430So we not only reset password if URL was changed, but also for username. Also, still require username if a new password was set.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22430Kamil TrzcińśkiKamil Trzcińśkihttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/799Use activerecord_sane_schema_dumper2016-10-14T16:52:38Zusername-removed-128633Use activerecord_sane_schema_dumper## What does this MR do?
EE side of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6827.
> `ActiveRecord::SaneSchemaDumper` modifies the behavior of Rails’ `ActiveRecord::SchemaDumper` so that the generated `db/schema.rb` file ...## What does this MR do?
EE side of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6827.
> `ActiveRecord::SaneSchemaDumper` modifies the behavior of Rails’ `ActiveRecord::SchemaDumper` so that the generated `db/schema.rb` file doesn’t contain any useless/harmful whitespace column alignment.
## Why was this MR needed?
To reduce potential conflicts in `db/schema.rb` (see https://gitlab.com/gitlab-org/gitlab-ee/issues/715).8.13Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/780Fix 500 error updating mirror URLs for projects2016-10-14T18:10:55ZJames LopezFix 500 error updating mirror URLs for projectsUpdating the mirror URL with an empty URL should just render the mirror page with the flash message stating that the URL can't be blank. At the moment we throw an error 500 if the old URL had some import data.
Fixes https://gitlab.com...Updating the mirror URL with an empty URL should just render the mirror page with the flash message stating that the URL can't be blank. At the moment we throw an error 500 if the old URL had some import data.
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/10828.13username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/694Fix ELASTIC_HOST env var in order to use a friendly value for URI parser.2016-10-14T19:17:06ZRubén DávilaFix ELASTIC_HOST env var in order to use a friendly value for URI parser.REF: gitlab-org/gitlab-ci-multi-runner#1628REF: gitlab-org/gitlab-ci-multi-runner#1628Stan HuStan Huhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/444Geo: Make sure OAuth routes that we generate for Geo matches with the ones in...2016-10-15T01:21:08ZGabriel MazettoGeo: Make sure OAuth routes that we generate for Geo matches with the ones in Rails routesThis will prevent errors in OAuth authentication for Geo.
Fixes #650This will prevent errors in OAuth authentication for Geo.
Fixes #6508.8Gabriel MazettoGabriel Mazettohttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/791Decrease maximum time to wait for a mirror process to finish from 1 day to 2 ...2016-10-17T00:37:26Zusername-removed-26174borja.aparicio.cotarelo@cern.chDecrease maximum time to wait for a mirror process to finish from 1 day to 2 hoursThis MR proposes to decrease the time that GitLab waits before to mark a mirror update process stuck as `failed`.
Full description of the scenario in #1093
Now this time is one day. When the problem happens, the user sees during one ...This MR proposes to decrease the time that GitLab waits before to mark a mirror update process stuck as `failed`.
Full description of the scenario in #1093
Now this time is one day. When the problem happens, the user sees during one day that the project was updating from upstream.
If a project has been updating from a remote for longer than 2 hours, we could conclude that something went wrong, mark the mirror as `failed` and retry next time.
Closes #10938.13Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/805CE->EE merge2016-10-18T15:39:45Zusername-removed-128633CE->EE mergeSupersedes !801.Supersedes !801.8.13username-removed-128633username-removed-128633