GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2016-11-07T19:29:12Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/23Add 7.14.x entries to CHANGELOG-EE2016-11-07T19:29:12ZRobert SpeicherAdd 7.14.x entries to CHANGELOG-EEhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/24Add 8.0 CE-to-EE update guide2016-11-07T19:29:12ZRobert SpeicherAdd 8.0 CE-to-EE update guide[ci skip][ci skip]8.0Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/25Update CHANGELOGs2016-11-07T19:28:07ZRobert SpeicherUpdate CHANGELOGs[ci skip][ci skip]8.0Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/26Look up Kerberos identity without the @REALM if a lookup for the full UPN did...2016-11-07T19:29:12Zusername-removed-230683Look up Kerberos identity without the @REALM if a lookup for the full UPN did not find the identity.Proposed fix for the issue reported as #34.Proposed fix for the issue reported as #34.https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/27Addresses regression with jenkins setup that does not use the multiproject setup2016-11-07T19:29:13Zusername-removed-106509Addresses regression with jenkins setup that does not use the multiproject setupThe Jenkins Gitlab Hook Plugin allows for two kinds of setups. One where a Jenkins job is created for each branch and one where all branches are built in a single Jenkins job. MR !9 added support for the multi-job setup but broke the s...The Jenkins Gitlab Hook Plugin allows for two kinds of setups. One where a Jenkins job is created for each branch and one where all branches are built in a single Jenkins job. MR !9 added support for the multi-job setup but broke the single job setup. This request addresses #30 and fixes the regression.8.0username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/28add issues template2016-11-07T19:29:13Zusername-removed-25949add issues templateThis MR implements an issues template that can be set for a project.
![settings_issues_template](https://gitlab.com/gitlab-org/gitlab-ee/uploads/51c3b9cd82cbb2dfdce80ed5c0a406c3/settings_issues_template.png)
![new_issue_issues_temp...This MR implements an issues template that can be set for a project.
![settings_issues_template](https://gitlab.com/gitlab-org/gitlab-ee/uploads/51c3b9cd82cbb2dfdce80ed5c0a406c3/settings_issues_template.png)
![new_issue_issues_template](https://gitlab.com/gitlab-org/gitlab-ee/uploads/cd7d44440223923db676b88edd412eb9/new_issue_issues_template.png)
This closes gitlab-org/gitlab-ce#1378
@JobV @sytses you owe me a :beer: :wink:
This MR is only marked as WIP because the tests are still running and the `CHANGELOG` hasn't been updated to 8.1 yet.
8.1https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/29Import Kerberos identities automatically from Active Directory2015-12-25T14:05:59Zusername-removed-114630Import Kerberos identities automatically from Active DirectoryCanonicalization of Kerberos identities to always include realm.
This resolve inconsistences in Kerberos identities, as sometimes
the realm would be included and sometimes not. Fixes #41
When Kerberos authentication is enabled (ei...Canonicalization of Kerberos identities to always include realm.
This resolve inconsistences in Kerberos identities, as sometimes
the realm would be included and sometimes not. Fixes #41
When Kerberos authentication is enabled (either via Omniauth or
for passwordless Git HTTP) together with an LDAP that is Active
Directory (AD), we can automatically import Kerberos identities
from Active Directory for LDAP users. These users can then authenticate
to GitLab with Kerberos without having to attach their Kerberos
identity beforehand via the Omniauth provider.
This behavior is automatically enabled. It seems unlikely that
one would enable Kerberos in an Active Directory environament and not
want this behavior.
8.4username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/30Fix Jenkins CI parameters2016-11-07T19:29:13ZDrew BlessingFix Jenkins CI parametersFixes #45
### Expected behavior
Multi-project and unstable Jenkins CI parameters should be successfully enabled and persisted if the boxes are checked.
### Observed behavior
If either of these checkboxes were selected and sav...Fixes #45
### Expected behavior
Multi-project and unstable Jenkins CI parameters should be successfully enabled and persisted if the boxes are checked.
### Observed behavior
If either of these checkboxes were selected and saved they were not persisted to the database. This is because the parameters were not in the list of allowed parameters in the controller.https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/31Fix Jenkins build URL with multi-project2016-11-07T19:29:14ZDrew BlessingFix Jenkins build URL with multi-projectFixes #46 and #43
### Expected behavior
With multiproject enabled, merge requests should display successful or failed build status. Given a GitLab Jenkins service URL of http://jenkins/job/test1, a GitLab project called test-projec...Fixes #46 and #43
### Expected behavior
With multiproject enabled, merge requests should display successful or failed build status. Given a GitLab Jenkins service URL of http://jenkins/job/test1, a GitLab project called test-project and branch ref of feature/ci_test_4 the correct build URL is
http://jenkins/job/test-project_feature_ci_test_5/scm/bySHA1/7c29b98573a9086737795ba8021f31da6b966ace
### Observed behavior
The build page URL was incorrectly generated, causing an error connecting to the CI server. Similarly, documentation was not updated to include information about the multiproject feature and how to properly configure it.
Given the same information as above, the current URL GitLab generates is
http://jenkins/job/test1/_feature/ci_test_4/scm/bySHA1/7c29b98573a9086737795ba8021f31da6b966aceDrew BlessingDrew Blessinghttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/32Allow to configure Jira api URL2015-11-02T08:44:44Zusername-removed-114630Allow to configure Jira api URLCf. support request 2829
Provide a property `api_url` for `JiraService` in order to customize the API path. This is necessary if for instance Jira is not installed at the root of the web server. For user convenience, the API URL is au...Cf. support request 2829
Provide a property `api_url` for `JiraService` in order to customize the API path. This is necessary if for instance Jira is not installed at the root of the web server. For user convenience, the API URL is automatically built from the Project URL using the same logic as before, so that it shouldn't be necessary for users to actually enter the API URL in most cases.
Remove the `api_version` property which seems redundant with the API URL. A DB migration
removes `api_version` and initializes the API URL from `project_url` and `api_version` using the same logic as before for a seamless transition.
8.2Marin JankovskiMarin Jankovskihttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/34CE upstream2016-11-07T19:29:14ZValery SizovCE upstream8.1Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/35Add 8.1 CE-to-EE update guide2016-11-07T19:29:14ZRobert SpeicherAdd 8.1 CE-to-EE update guide[ci skip][ci skip]8.1Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/36Fix JIRA mention spec2015-10-16T20:27:00ZDouwe MaanFix JIRA mention specFixes spec that was skipped in 10de4261f03f5e877a060d39ee6a08943c194e5a.
The expected behavior with commits mentioning issues, is that when the commit _closes_ the issue, the issue only gets the "closed by commit X" comment, and not a...Fixes spec that was skipped in 10de4261f03f5e877a060d39ee6a08943c194e5a.
The expected behavior with commits mentioning issues, is that when the commit _closes_ the issue, the issue only gets the "closed by commit X" comment, and not also the "mentioned in commit X" comment.
With JIRA, it used to get both, and now does no longer.
The spec was updated to test the new ("correct") behavior.8.1Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/37Fix "Rebase onto master"2015-10-16T14:57:37ZValery SizovFix "Rebase onto master"https://gitlab.com/gitlab-org/gitlab-ee/issues/25https://gitlab.com/gitlab-org/gitlab-ee/issues/258.1username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/38Invalidate stored jira password if the endpoint URL is changed2016-11-07T19:29:14ZValery SizovInvalidate stored jira password if the endpoint URL is changedhttps://gitlab.com/gitlab-org/gitlab-ce/issues/2997https://gitlab.com/gitlab-org/gitlab-ce/issues/29978.2username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/39CE upstream2016-11-07T19:29:14ZValery SizovCE upstream8.2Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/40Re-add Kerberos to AuthHelper form-based providers2016-11-07T19:29:14ZValery SizovRe-add Kerberos to AuthHelper form-based providers8.2Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/43Page is not reloaded periodically to check if rebase is finished2016-11-07T19:29:14ZValery SizovPage is not reloaded periodically to check if rebase is finishedhttps://gitlab.com/gitlab-org/gitlab-ee/issues/55https://gitlab.com/gitlab-org/gitlab-ee/issues/558.2username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/44When someone as marked as a required approver for a merge request, an email s...2016-11-28T16:53:03ZValery SizovWhen someone as marked as a required approver for a merge request, an email should be senthttps://gitlab.com/gitlab-org/gitlab-ee/issues/16https://gitlab.com/gitlab-org/gitlab-ee/issues/168.2username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/45Improve JIRA issue closing2016-11-07T19:29:15ZDrew BlessingImprove JIRA issue closing- Zendesk ticket: https://gitlab.zendesk.com/agent/tickets/11034
### Expected behavior
When a merge request has 'Fixes JIRA-1234' in the description the issue should not only be transitioned but also record a comment (regardless of...- Zendesk ticket: https://gitlab.zendesk.com/agent/tickets/11034
### Expected behavior
When a merge request has 'Fixes JIRA-1234' in the description the issue should not only be transitioned but also record a comment (regardless of workflow type in JIRA).
### Observed behavior
Depending on the configured workflow a comment may or may not be allowed while transitioning to a new state. In my testing the newest JIRA default workflow did not allow comments while transitioning to 'Done', for example. The 'classic' workflow does, though.
This merge request splits the transition and comment in to two API calls. The advantage is that the comment will be recorded 100% of the time instead of it being dependent on the workflow configuration.
Also, JIRA returns a '204' response code when the transition is successful. I added '204' to the success conditional because we were generating an error in the current configuration even though the transition was successful.