GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2017-06-13T06:27:11Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1927WIP: Add additional user actions in Audit events2017-06-13T06:27:11ZJames LopezWIP: Add additional user actions in Audit eventsAdds the additional user events (this does not change the underlying current audit mechanism)
I decided using callbacks to make sure we don't forget to add a relevant event for actions added in the future.
I decided against Thread ...Adds the additional user events (this does not change the underlying current audit mechanism)
I decided using callbacks to make sure we don't forget to add a relevant event for actions added in the future.
I decided against Thread local as I had problems in the past and because of [this](https://stackoverflow.com/a/11670283), [this](https://github.com/rails/rails/issues/8517) and [this](https://stackoverflow.com/a/8291218).
- Add a new email address
- Remove an email address
- Password change
- Forget password
- Failed to login
- Add SSH key
- Grant Oauth access
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/1370
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
9.4James LopezJames Lopezhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2050Related issues FE -- Step 7 v2: Add input processing methods to root2017-06-13T13:56:06Zusername-removed-892863contact@ericeastwood.comRelated issues FE -- Step 7 v2: Add input processing methods to rootSee https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797
- Add pending related issues input processing methods to `RelatedIssuesRoot`
- Various integration fixes as this is the last step
This is a simpler version of https...See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797
- Add pending related issues input processing methods to `RelatedIssuesRoot`
- Various integration fixes as this is the last step
This is a simpler version of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1816/ - we no longer check the form of a pending related issue before tokenizing. As soon as you stop touching a piece of text, we consider it a visual pending related issue. We also no longer use a `issueMap`. It's just two arrays, `relatedIssues` with issue objects and `pendingReferences` which is strings.9.4username-removed-892863contact@ericeastwood.comusername-removed-892863contact@ericeastwood.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2113Small Pipeline schedules UI enhancements2020-07-09T15:41:49Zusername-removed-408230Small Pipeline schedules UI enhancements## What does this MR do?
- Makes interval pattern selector label font normal
- Makes revision selector toggle font normal, not monospace
### Before:
![Screen_Shot_2017-06-12_at_11.35.10_AM](/uploads/75cdfb10b1c9ce78937b5108e7e46b24/Scr...## What does this MR do?
- Makes interval pattern selector label font normal
- Makes revision selector toggle font normal, not monospace
### Before:
![Screen_Shot_2017-06-12_at_11.35.10_AM](/uploads/75cdfb10b1c9ce78937b5108e7e46b24/Screen_Shot_2017-06-12_at_11.35.10_AM.png)
![Screen_Shot_2017-06-12_at_11.35.02_AM](/uploads/bae1deb6a6b15f4ce54a9a5a0787e9cd/Screen_Shot_2017-06-12_at_11.35.02_AM.png)
### After:
![Screen_Shot_2017-06-12_at_11.37.00_AM](/uploads/11d056fabac8620fc90c9d4aed93dca8/Screen_Shot_2017-06-12_at_11.37.00_AM.png)
![Screen_Shot_2017-06-12_at_11.38.26_AM](/uploads/6020aa0bd5dc687181064576ca1b9103/Screen_Shot_2017-06-12_at_11.38.26_AM.png)
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/325659.4https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2114Slightly refactor pipeline schedules form in preparation for additions2017-06-13T14:53:11Zusername-removed-408230Slightly refactor pipeline schedules form in preparation for additions## What does this MR do?
- Refactors interval pattern input component to a `.vue` file and updates spec
- Uses `this.$nextTick` in favor of importing `Vue` for it
- Adds helpful comments to form bundle, in anticipation of additions ...## What does this MR do?
- Refactors interval pattern input component to a `.vue` file and updates spec
- Uses `this.$nextTick` in favor of importing `Vue` for it
- Adds helpful comments to form bundle, in anticipation of additions in %"9.4"
There are no changes to existing behavior, styles or logic.9.4https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2274WIP: Completely disable the rebase merge method when unlicensed2017-06-27T13:16:56ZNick ThomasWIP: Completely disable the rebase merge method when unlicensed## What does this MR do?
Completely removes the `rebase_merge` strategy when unlicensed.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
!2200 was an incomplete solution to #257...## What does this MR do?
Completely removes the `rebase_merge` strategy when unlicensed.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
!2200 was an incomplete solution to #2570
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25709.4Nick ThomasNick Thomashttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2283Add "members_count" and "parent_id" data on namespaces API2020-07-09T15:39:35ZOswaldo FerreirAdd "members_count" and "parent_id" data on namespaces APIRelated to https://gitlab.com/gitlab-com/customers-gitlab-com/issues/122 and https://gitlab.com/gitlab-com/customers-gitlab-com/issues/123.
This MR adds the information of `members_count` and `parent_id` on `Namespace::Entity` in ord...Related to https://gitlab.com/gitlab-com/customers-gitlab-com/issues/122 and https://gitlab.com/gitlab-com/customers-gitlab-com/issues/123.
This MR adds the information of `members_count` and `parent_id` on `Namespace::Entity` in order to being consumed by `GET /namespaces` endpoint. This data will be primarily used by customers.gitlab.com.
Note that using `GET /namespaces` instead `GET /groups` endpoint give us the ability of having `User#namespace` and `Groups` information with a single request.
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?9.4Oswaldo FerreirOswaldo Ferreirhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2340Use trigger(:click) instead of trigger to avoid a weird transient bug2017-07-06T17:39:11Zusername-removed-128633Use trigger(:click) instead of trigger to avoid a weird transient bug## What does this MR do?
I don't get why we get this transient failure, but I think using `trigger(:click)` is ok given the screenshot that clearly shows that there is no overlapping element on the dropdown (see the issue)...
## What a...## What does this MR do?
I don't get why we get this transient failure, but I think using `trigger(:click)` is ok given the screenshot that clearly shows that there is no overlapping element on the dropdown (see the issue)...
## What are the relevant issue numbers?
Closes #28439.4username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2347Add variables to pipelines schedules -- EE merge edition2017-07-07T18:44:58Zusername-removed-892863contact@ericeastwood.comAdd variables to pipelines schedules -- EE merge editionEE merge edition of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12372
---
cc @dosuken123EE merge edition of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12372
---
cc @dosuken1239.4Kamil TrzcińśkiKamil Trzcińśkihttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2369CE upstream: Friday2017-07-07T08:51:04Zusername-removed-423915CE upstream: FridayThis is merely based on !2361This is merely based on !23619.4username-removed-423915username-removed-423915https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2380CE PORT - native group milestones2017-07-10T16:50:34ZFelipe ArturCE PORT - native group milestonesport for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12280port for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/122809.4Felipe ArturFelipe Arturhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2507WIP: Preparing 9.4.1-ee release2017-07-25T13:53:27ZJames EJWIP: Preparing 9.4.1-ee releaseMain release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/35435
### Summary
This MR prepares `9-4-stable-ee` for %"9.4" (`9.4.1`) by merging `9-4-stable-ee-patch-1` into `9-4-stable-ee`
### MR Filter for ~"Pick into Sta...Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/35435
### Summary
This MR prepares `9-4-stable-ee` for %"9.4" (`9.4.1`) by merging `9-4-stable-ee-patch-1` into `9-4-stable-ee`
### MR Filter for ~"Pick into Stable" MRs
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=Pick+into+Stable&milestone_title=9.4&scope=all&sort=updated_asc&state=merged
### Steps
- Ensure all the MRs in above list are picked into `9-4-stable-ee-patch-1` branch.
- Note the following in each picked MR:
```
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2507, will merge into `9-4-stable-ee` ready for `9.4.1-ee`
/unlabel ~"Pick into Stable"
```
- If there are any conflicts while picking MRs, attempt to resolve, otherwise create new MR against `9-4-stable-ee-patch-1` branch and assign it to author of conflicting files.
- Consider merging CE-to-EE stable MR into this as well for new workflow
- Once this MR is green merge it.9.4James EJJames EJhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2516Don't treat anonymous users as owners when group has pending invites2017-07-25T12:19:25Zusername-removed-443319Don't treat anonymous users as owners when group has pending invitesEE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13037. (That's already merged - there is a spec failure on EE when picking it, not a merge conflict.)EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13037. (That's already merged - there is a spec failure on EE when picking it, not a merge conflict.)9.4Grzegorz BizonGrzegorz Bizonhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2595WIP: Prepare 9.4.4-ee release2017-08-03T22:38:04ZJames EJWIP: Prepare 9.4.4-ee releaseMain release issue:
### Summary
This MR prepares `9-4-stable-ee` for %"9.4" (`9.4.4-ee`) by merging `9-4-stable-ee-patch-4` into `9-4-stable-ee`
### MR Filter for ~"Pick into Stable" MRs
https://gitlab.com/gitlab-org/gitlab-ee/merge...Main release issue:
### Summary
This MR prepares `9-4-stable-ee` for %"9.4" (`9.4.4-ee`) by merging `9-4-stable-ee-patch-4` into `9-4-stable-ee`
### MR Filter for ~"Pick into Stable" MRs
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=Pick+into+Stable&milestone_title=9.4&scope=all&sort=updated_asc&state=merged
### Steps
- Ensure all the MRs in above list are picked into `9-4-stable-ee-patch-4` branch.
- Note the following in each picked MR:
```
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/MERGE_REQUST_ID, will merge into `9-4-stable-ee` ready for `9.4.4-ee`
/unlabel ~"Pick into Stable"
```
- If there are any conflicts while picking MRs, attempt to resolve, otherwise create new MR against `9-4-stable-ee-patch-4` branch and assign it to author of conflicting files.
- Consider merging CE-to-EE stable MR into this as well for new workflow
- Once this MR is green merge it.9.4James EJJames EJhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2703Fetch correct key in the settings hash2017-08-17T12:08:01ZZeger-Jan van de Wegzegerjan@gitlab.comFetch correct key in the settings hash## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](htt...## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/3172
/cc @ayufan @ahanselka 9.4Zeger-Jan van de Wegzegerjan@gitlab.comZeger-Jan van de Wegzegerjan@gitlab.com