Add a build preparation script, modify gitlab.ci.yml to use the script.
Updated the .gitlab-ci.yml to use a script which contains build preparation for runners which might run docker images with CI runner.
Regular builds should be not affected.
See merge request !834
Fix 403 Access Denied error messages when accessing Labels section in a project
This would occur if the project's issues or merge requests features were disabled. The change in 9bcd36396b caused `can?(current_user, :read_merge_request, project)` to be false if the merge request feature were disabled, so `authorize_labels!` needs to be changed accordingly.
Closes#1813
See merge request !836
Fix behavior of ldap_person method in Gitlab::OAuth::User
Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.
Restored the previous implementation of ldap_person, as I could not find a more concise to write it that still works with all the test cases.
See merge request !837
Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.
Fix duplicate 'Email has already been taken' message when creating a user
devise :validatable and validates uniqueness set on the user email field cause 2 validations to fire when creating a new user with an email address already in use, Issue 6123
@stanhu Thanks for your input on merge request 807, I'll close that one in favour of this as I have added tests
See merge request !817
Support commenting on a diff in side-by-side view
### What does this MR do?
This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment.
There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later.
### Why was this MR needed?
Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments.
### What are the relevant issue numbers?
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
### Screenshot
See merge request !810
Fix hooks for web based events with external issue references
The creation of cross references for external issues (which would fail)
is now prevented. This fixes a 500 error and the execution of hooks when
creating a merge request or commenting on one.
Fixes#1650, GH-9333.
This regression might have been introduced by
8f8a8ab32b. There is actually a TODO by
@rspeicher mentioning external issues which is lost (unhandled) in a
later commit.
This fix is related to !766 and !804 which fix a similar issue for hooks for
Git based events.
See merge request !794
Dmitriy Zaporozhets
Douwe Maan
Stan Hu
Marin Jankovski
Alex Lossent
Sytse Sijbrandij
Jacob Vosmaer
Job van der Voort
Karen Carias
Robert Speicher
Darby
Robert Speicher
swellard
Dmitriy Zaporozhets
Valery Sizov
Nicolas
Valery Sizov
