GitLab FOSS merge requestshttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests2017-09-05T14:34:24Zhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13397wip: display group milestones in dashboard view2017-09-05T14:34:24Zusername-removed-642931git@selfup.mewip: display group milestones in dashboard view## What does this MR do?
Attempts to solve https://gitlab.com/gitlab-org/gitlab-ce/issues/35748
## Are there points in the code the reviewer needs to double check?
Yes, the ruby :gem:
## Why was this MR needed?
## Screenshots (if r...## What does this MR do?
Attempts to solve https://gitlab.com/gitlab-org/gitlab-ce/issues/35748
## Are there points in the code the reviewer needs to double check?
Yes, the ruby :gem:
## Why was this MR needed?
## Screenshots (if relevant)
![Screen_Shot_2017-08-08_at_2.15.25_PM](/uploads/954a5b7e8b49b5503b8b39b4b56c23e1/Screen_Shot_2017-08-08_at_2.15.25_PM.png)
## 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-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
#3574810.0https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13390Allow committing from a new branch.2017-09-20T02:17:56ZJacob SchatzAllow committing from a new branch.## What does this MR do?
Allow user to create a new branch (from the branch dropdown) when committing instead of selecting an existing one.
## Are there points in the code the reviewer needs to double check?
## Why was this MR n...## What does this MR do?
Allow user to create a new branch (from the branch dropdown) when committing instead of selecting an existing one.
## 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-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?10.0username-removed-502136username-removed-502136https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13369WIP: Replaced our CLA with Linux Foundation's Developer Certificate of Origin2017-08-10T09:43:23ZEliran MesikaWIP: Replaced our CLA with Linux Foundation's Developer Certificate of Origin## Background
The Debian community requested we change our CLA for several reasons:
1. Having license that grants a different set of rights to a single entity is not something that is comfortable for the community. They would rather, f...## Background
The Debian community requested we change our CLA for several reasons:
1. Having license that grants a different set of rights to a single entity is not something that is comfortable for the community. They would rather, for instance, license all changes under a permissive license to everyone.
1. Having a permissive license, you can always release the code under a license of your choice, and its terms would be binding
overall. And if you wanted to change the Open Source license, previous contributions would also remain available under the terms they were contributed under, but all of your code, and all new code and new contributions, would be under the new license. Effectively, a permissive license gives you all the same rights a CLA would.
1. Warranties of provenance work well with Developer Certificate of Origin (DCO), without requiring a CLA
## Change
Replacing our CLA with [Linux Foundation's DCO](https://developercertificate.org/) with one change replacing mentions of 'file' with 'project' for where the license is stored in GitLab's case.
*IMPORTANT*: This is subject to LF's approval of the change in language. @eliran.mesika will seek the approval if we move forward.
## Review and Merging
@gwynfm will review the change. We will only merge this MR if and when the Debian community commits to migrating to GitLab.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13363WIP: Resolve "Searchable settings puts expand/collapse toggle in an invalid s...2017-11-06T20:30:53Zusername-removed-636429WIP: Resolve "Searchable settings puts expand/collapse toggle in an invalid state."Fix a ~regression from !12247 in which the the expand/collapse toggle is put into an invalid state after using a text search to open a settings panel.Fix a ~regression from !12247 in which the the expand/collapse toggle is put into an invalid state after using a text search to open a settings panel.9.4username-removed-636429username-removed-636429https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13358Forbid blocked users to create a pipeline2017-08-21T15:12:08ZShinya MaedaForbid blocked users to create a pipeline## What does this MR do?
This MR forbids blocked users to create a pipeline
## Are there points in the code the reviewer needs to double check?
Does this resolve https://gitlab.com/gitlab-com/infrastructure/issues/2425#note_36958576?
...## What does this MR do?
This MR forbids blocked users to create a pipeline
## Are there points in the code the reviewer needs to double check?
Does this resolve https://gitlab.com/gitlab-com/infrastructure/issues/2425#note_36958576?
## Why was this MR needed?
Due to https://gitlab.com/gitlab-com/infrastructure/issues/2425#note_36958576
## Screenshots (if relevant)
N/A
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- Review
- Has been reviewed by UX
- Has been reviewed by Frontend
- [x] Has been reviewed by Backend
- Has been reviewed by Database
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
- https://gitlab.com/gitlab-com/infrastructure/issues/2425#note_36958576Shinya MaedaShinya Maedahttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13342Allow event_filter to be set via GET/POST in addition to cookie2017-09-04T11:34:34Zusername-removed-810112Allow event_filter to be set via GET/POST in addition to cookie## 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?
- [x] [Changelog entry](https://docs....## 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?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
#1801username-removed-810112username-removed-810112https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13337Disable Ajax request for GPG status on repository page2017-08-17T12:44:58ZWinnie HellmannDisable Ajax request for GPG status on repository page## What does this MR do?
Load GPG status for commits on the following pages
- repository
- search
- compare branches
## Screenshots
TODO
## What are the relevant issue numbers?
closes #36046## What does this MR do?
Load GPG status for commits on the following pages
- repository
- search
- compare branches
## Screenshots
TODO
## What are the relevant issue numbers?
closes #36046https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13322WIP: Experiment to use build_stubbed instead of create in model specs2017-09-07T16:34:19Zusername-removed-128633WIP: Experiment to use build_stubbed instead of create in model specs## 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....## 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-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
Closes #36008username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13321WIP: Experiment to make user/author use project.creator in factories2017-09-06T11:56:57Zusername-removed-128633WIP: Experiment to make user/author use project.creator in factories## 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....## 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-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
Closes #36009username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13312WIP: Add styleguide on capturing images2017-08-07T17:10:11ZAchilleas PipinellisWIP: Add styleguide on capturing images## What does this MR do?
Add a few notes on capturing images to be used with docs.## What does this MR do?
Add a few notes on capturing images to be used with docs.9.5Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13279use slug as wiki title2017-08-17T13:57:08Zusername-removed-927533use slug as wiki title## What does this MR do? / Why was this MR needed?
Closes #35918
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] All builds are pas...## What does this MR do? / Why was this MR needed?
Closes #35918
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] All builds are passing
- [ ] Has been reviewed by Frontend
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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)username-removed-927533username-removed-927533https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13271WIP: Freeze API V32017-08-22T19:13:43ZToon ClaesWIP: Freeze API V3## What does this MR do?
It freezes the API V3 code.
## Are there points in the code the reviewer needs to double check?
Nothing that was changed for V3 already is not reverted.
## Why was this MR needed?
To avoid V4 changes breaks ...## What does this MR do?
It freezes the API V3 code.
## Are there points in the code the reviewer needs to double check?
Nothing that was changed for V3 already is not reverted.
## Why was this MR needed?
To avoid V4 changes breaks something in V3.
## File checklist
- [x] modified lib/api/api.rb
- [x] new file lib/api/v3/access_requests.rb
- [x] new file lib/api/v3/api.rb
- [x] new file lib/api/v3/api_guard.rb
- [x] modified lib/api/v3/boards.rb
- [x] modified lib/api/v3/branches.rb
- [x] modified lib/api/v3/broadcast_messages.rb
- [x] modified lib/api/v3/builds.rb
- [x] new file lib/api/v3/commit_statuses.rb
- [x] modified lib/api/v3/commits.rb
- [x] modified lib/api/v3/deploy_keys.rb
- [x] modified lib/api/v3/deployments.rb
- [x] modified lib/api/v3/entities.rb
- [x] modified lib/api/v3/environments.rb
- [x] new file lib/api/v3/events.rb
- [x] new file lib/api/v3/features.rb
- [x] modified lib/api/v3/files.rb
- [x] new file lib/api/v3/group_milestones.rb
- [x] new file lib/api/v3/group_variables.rb
- [x] modified lib/api/v3/helpers.rb
- [x] new file lib/api/v3/internal.rb
- [x] modified lib/api/v3/issues.rb
- [x] new file lib/api/v3/jobs.rb
- [x] new file lib/api/v3/keys.rb
- [x] modified lib/api/v3/labels.rb
- [x] new file lib/api/v3/lint.rb
- [x] modified lib/api/v3/members.rb
- [x] new file lib/api/v3/milestone_responses.rb
- [x] modified lib/api/v3/milestones.rb
- [x] new file lib/api/v3/namespaces.rb
- [x] modified lib/api/v3/notes.rb
- [x] new file lib/api/v3/notification_settings.rb
- [x] new file lib/api/v3/pagination_params.rb
- [x] new file lib/api/v3/pipeline_schedules.rb
- [x] modified lib/api/v3/pipelines.rb
- [x] modified lib/api/v3/project_hooks.rb
- [x] new file lib/api/v3/project_milestones.rb
- [x] modified lib/api/v3/project_snippets.rb
- [x] modified lib/api/v3/projects.rb
- [x] new file lib/api/v3/protected_branches.rb
- [x] modified lib/api/v3/repositories.rb
- [x] new file lib/api/v3/runner.rb
- [x] modified lib/api/v3/runners.rb
- [x] new file lib/api/v3/scope.rb
- [x] modified lib/api/v3/services.rb
- [x] new file lib/api/v3/session.rb
- [x] modified lib/api/v3/settings.rb
- [x] new file lib/api/v3/sidekiq_metrics.rb
- [x] modified lib/api/v3/snippets.rb
- [x] modified lib/api/v3/subscriptions.rb
- [x] modified lib/api/v3/system_hooks.rb
- [x] modified lib/api/v3/tags.rb
- [x] modified lib/api/v3/time_tracking_endpoints.rb
- [x] modified lib/api/v3/todos.rb
- [x] modified lib/api/v3/triggers.rb
- [x] modified lib/api/v3/users.rb
- [x] modified lib/api/v3/variables.rb
- [x] new file lib/api/v3/version.rb
## 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-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
Closes #35430.https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13255Docs/devops gamedev gitlab2017-09-28T14:25:39Zusername-removed-680744Docs/devops gamedev gitlab## What does this MR do?
Add the included article per the issue here: https://gitlab.com/gitlab-com/community-writers/issues/5
## Are there points in the code the reviewer needs to double check?
If a link to this should be added to the ...## What does this MR do?
Add the included article per the issue here: https://gitlab.com/gitlab-com/community-writers/issues/5
## Are there points in the code the reviewer needs to double check?
If a link to this should be added to the parent articles/index.md
## 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-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?username-removed-680744username-removed-680744https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13237Improve MR feature specs and reduce duplication2017-08-16T12:11:34Zusername-removed-128633Improve MR feature specs and reduce duplication## What does this MR do?
In this MR:
- Better organization of files:
- `spec/features/merge_request/` => single MR scenari
- `spec/features/merge_requests/` => MRs list scenari
- Better file naming: `<actor>_<action>_spec.rb...## What does this MR do?
In this MR:
- Better organization of files:
- `spec/features/merge_request/` => single MR scenari
- `spec/features/merge_requests/` => MRs list scenari
- Better file naming: `<actor>_<action>_spec.rb`
- Better feature title, e.g. "Merge request > User sees merge widget"
- Usage of RSpec's default DSL: `describe`, `let`, `before`, `it`
- Removal of wrong-level assertions, e.g. `expect_tokens`
- Grouping of multiple `it`
- Extraction of shared behaviors to 2 new shared examples files
Next steps:
- Migrate `features/project/merge_requests.feature` to RSpec
- Take the opportunity to remove duplicate scenari
- Further streamline redundant specs in `spec/features/merge_request/` and `spec/features/merge_requests/`
- Apply the same rules and refactoring to other feature specs
- Use `spec/features/merge_request/` and `spec/features/merge_requests/` as examples of good practices9.5username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13189fix gitlab-org/gitlab-ee#21902017-08-01T10:32:07Zusername-removed-226474fix gitlab-org/gitlab-ee#2190## What does this MR do?
fix gitlab-org/gitlab-ee#2190
When you get raw by `http://gitlab.example.com/api/v4/projects/user%2Fproj/repository/files/README.md/raw?ref=master`, got `404 not found`.
## Are there points in the code t...## What does this MR do?
fix gitlab-org/gitlab-ee#2190
When you get raw by `http://gitlab.example.com/api/v4/projects/user%2Fproj/repository/files/README.md/raw?ref=master`, got `404 not found`.
## Are there points in the code the reviewer needs to double check?
no, it's simple. I think.
## Why was this MR needed?
`http://gitlab.example.com/api/v4/projects/user%2Fproj/repository/files/README.md/raw?ref=master` returns 404. Developer cannot get raw file content directly.
## Screenshots (if relevant)
N/A
## 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-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- Review
- [ ] ~~Has been reviewed by UX~~
- [ ] ~~Has been reviewed by Frontend~~
- [ ] Has been reviewed by Backend
- [ ] ~~Has been reviewed by Database~~
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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.5username-removed-226474username-removed-226474https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13177WIP: Extend WebHooks to support HTTP Negotiate/SPNEGO (Kerberos)2017-10-06T22:15:16Zusername-removed-1230272WIP: Extend WebHooks to support HTTP Negotiate/SPNEGO (Kerberos)## What does this MR do?
Extend WebHooks to support HTTP Negotiate/SPNEGO (Kerberos) -- fixes #31078.
This required replacing HTTParty with HTTPI.
This is a WIP MR because I haven't yet tested it against an actual Kerberized webserver...## What does this MR do?
Extend WebHooks to support HTTP Negotiate/SPNEGO (Kerberos) -- fixes #31078.
This required replacing HTTParty with HTTPI.
This is a WIP MR because I haven't yet tested it against an actual Kerberized webserver. But I want to post it so folks know that this is in-progress.
## Why was this MR needed?
We need Kerberos authentication so that our webhook receiver can tell that a webhook call in fact came from Gitlab (and thus that the information therein is trustworthy). Because the webhook is installed on user-owned repositories, there is no way to use a shared secret for authentication.
## 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-ce/blob/master/doc/development/doc_styleguide.md)
- [/] API support added
- Tests
- [/] Added for this feature/bug
- [/] All builds are passing
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
#31078https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13176WIP: Display the username and email of the creator of a project in the webhoo...2017-09-13T03:26:21Zusername-removed-479391WIP: Display the username and email of the creator of a project in the webhook dataOpening this merge request to get feedback on the change will update tests/documentation later.
## What does this MR do?
Adds extra fields about the creator of a project in the system webhook sent on projects events.
## Are there ...Opening this merge request to get feedback on the change will update tests/documentation later.
## What does this MR do?
Adds extra fields about the creator of a project in the system webhook sent on projects events.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Fixes the feature request #35597
## 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-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
#35597https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13101Fix duplicated event for tag removal2017-07-28T17:50:16Zusername-removed-710385Fix duplicated event for tag removal## What does this MR do?
The merge request removes some redundant calls, which led to duplicate events for removed tags.
## Are there points in the code the reviewer needs to double check?
Yes.
I'm not entirely sure my assess...## What does this MR do?
The merge request removes some redundant calls, which led to duplicate events for removed tags.
## Are there points in the code the reviewer needs to double check?
Yes.
I'm not entirely sure my assessment how the event is triggered is correct. This should be verified to ensure that the change doesn't break unrelated functionality.
## Why was this MR needed?
Issue #35406: Two events are created for a delete tag event and also two notifications.
Diagnosis:
When a tag is removed, the PostReceive worker is being triggered,
which in turn triggers GitTagPushService to process the tag changes.
This in turn uses EventCreateService to track a push and fires
project hooks and services. Thus the explicit calls in Tags::DestroyService
are redundant, leading to duplicate events being tracked.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/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/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
#35406 (and the closed issue: #35506)username-removed-710385username-removed-710385https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13085WIP: Fix broken links in HTML push emails2017-07-26T15:58:44Zusername-removed-1291415WIP: Fix broken links in HTML push emails## What does this MR do?
Bug fix for broken HTML links in push emails, issue: #35543
## Tests
I tested the following cases: changing, adding, renaming and removing files having "Disable code diffs" in the configuration of the "Email...## What does this MR do?
Bug fix for broken HTML links in push emails, issue: #35543
## Tests
I tested the following cases: changing, adding, renaming and removing files having "Disable code diffs" in the configuration of the "Emails on push" service enabled and disabled: in call cases the "changed files" section contained proper links to the respective gitlab server.
## What are the relevant issue numbers?
Closes #35543https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13083WIP: Add group wiki support2017-09-21T11:26:49Zusername-removed-43728WIP: Add group wiki supportThis MR adds wiki page support to groups.
General workflow looks like:
- on group settings page, user can select `Wiki Project`. In this dropdown exist all group projects with enabled wiki.
- on group page user sees `Wiki` tab
- on...This MR adds wiki page support to groups.
General workflow looks like:
- on group settings page, user can select `Wiki Project`. In this dropdown exist all group projects with enabled wiki.
- on group page user sees `Wiki` tab
- on this tab user sees wiki from selected project. All wiki behavior occurs in group context (all links behave as group links)
I'm not sure in dropdown on group settings page (I like dropdowns from MR page)
Tests and docs not implemented/fixed yet.
## 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-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] Changes for admin area
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/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?
Closes #4037Douwe MaanDouwe Maan