GitLab FOSS merge requestshttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests2017-10-25T00:20:16Zhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14748[Rails 5] Fix db:migrate:reset-mysql and db:migrate:reset-mysql2017-10-25T00:20:16Zusername-removed-86853blackst0ne.ru@gmail.com[Rails 5] Fix db:migrate:reset-mysql and db:migrate:reset-mysql## What does this MR do?
Fixes errors in the `db:migrate:reset-mysql` and `db:migrate:reset-mysql` steps of !12841
1. Fix `db/migrate/20170913131410_environments_project_id_not_null.rb`.
2. Fix `db/migrate/20170707183807_add_group...## What does this MR do?
Fixes errors in the `db:migrate:reset-mysql` and `db:migrate:reset-mysql` steps of !12841
1. Fix `db/migrate/20170913131410_environments_project_id_not_null.rb`.
2. Fix `db/migrate/20170707183807_add_group_id_to_milestones.rb`
3. Fix ActiveRecord deprecation warnings about AR versions.Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14706Use full URL of user avatar on webhook push2017-10-05T17:20:52Zusername-removed-86853blackst0ne.ru@gmail.comUse full URL of user avatar on webhook push## What does this MR do?
Adds the `(only_path: :false)` in `push_event_payload_service.rb`
I didn't add a changelog entry because this MR should be part of !13401 which already has an entry.
## Why was this MR needed?
Pass f...## What does this MR do?
Adds the `(only_path: :false)` in `push_event_payload_service.rb`
I didn't add a changelog entry because this MR should be part of !13401 which already has an entry.
## Why was this MR needed?
Pass full URL of user avatar in push webhook payload.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #3433910.1username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14703Send a confirmation email when the user adds a secondary email address2017-10-05T15:19:04ZDouwe MaanSend a confirmation email when the user adds a secondary email addresshttps://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14037 + resolved conflicts + resolved https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14037#note_42266050
Closes #37385, #28621, #36959https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14037 + resolved conflicts + resolved https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14037#note_42266050
Closes #37385, #28621, #3695910.1username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14694Remove 'Repo' prefix from API entities2017-10-05T09:47:56Zusername-removed-86853blackst0ne.ru@gmail.comRemove 'Repo' prefix from API entities## What does this MR do?
1. Removes the `Repo` prefix from API entities.
2. Removes the hack added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9351
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](h...## What does this MR do?
1. Removes the `Repo` prefix from API entities.
2. Removes the hack added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9351
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [x] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [x] API support added
- [x] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2841710.1username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14692[rails 5] Fix spec/routing/project_routing_spec.rb2017-10-05T08:05:31Zusername-removed-86853blackst0ne.ru@gmail.com[rails 5] Fix spec/routing/project_routing_spec.rb## What does this MR do?
It fixes [spec/routing/project_routing_spec.rb failures](https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/35133684) like
```ruby
1) project routing Projects::WikisController routing to #history
Failure/Er...## What does this MR do?
It fixes [spec/routing/project_routing_spec.rb failures](https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/35133684) like
```ruby
1) project routing Projects::WikisController routing to #history
Failure/Error: expect(get('/gitlab/gitlabhq/wikis/1/history')).to route_to('projects/wikis#history', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
The recognized options <{"format"=>:html, "controller"=>"projects/wikis", "action"=>"history", "namespace_id"=>"gitlab", "project_id"=>"gitlabhq", "id"=>"1"}> did not match <{"namespace_id"=>"gitlab", "project_id"=>"gitlabhq", "id"=>"1", "controller"=>"projects/wikis", "action"=>"history"}>, difference:.
--- expected
+++ actual
@@ -1 +1 @@
-{"namespace_id"=>"gitlab", "project_id"=>"gitlabhq", "id"=>"1", "controller"=>"projects/wikis", "action"=>"history"}
+{"format"=>:html, "controller"=>"projects/wikis", "action"=>"history", "namespace_id"=>"gitlab", "project_id"=>"gitlabhq", "id"=>"1"}
# ./spec/routing/project_routing_spec.rb:153:in `block (3 levels) in <top (required)>'
```
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [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-org/gitlab-ce/merge_requests/12841Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14691[Rails 5] Fix link_to_member_avatar2017-10-05T06:55:47Zusername-removed-86853blackst0ne.ru@gmail.com[Rails 5] Fix link_to_member_avatar## What does this MR do?
This is a quick fix for
```
ActionView::Template::Error:
nil is not a valid asset source
# ./app/helpers/lazy_image_tag_helper.rb:12:in `image_tag'
# ./app/helpers/projects_helper....## What does this MR do?
This is a quick fix for
```
ActionView::Template::Error:
nil is not a valid asset source
# ./app/helpers/lazy_image_tag_helper.rb:12:in `image_tag'
# ./app/helpers/projects_helper.rb:27:in `link_to_member_avatar'
# ./app/helpers/projects_helper.rb:39:in `link_to_member'
# ./app/views/shared/issuable/_participants.html.haml:14:in `block in _app_views_shared_issuable__participants_html_haml___1967790359849897399_307108740'
# ./app/views/shared/issuable/_participants.html.haml:12:in `each'
# ./app/views/shared/issuable/_participants.html.haml:12:in `_app_views_shared_issuable__participants_html_haml___1967790359849897399_307108740'
# ./app/views/shared/issuable/_sidebar.html.haml:122:in `block in _app_views_shared_issuable__sidebar_html_haml__4258134513421332557_279739320'
# ./app/views/shared/issuable/_sidebar.html.haml:18:in `_app_views_shared_issuable__sidebar_html_haml__4258134513421332557_279739320'
# ./app/views/projects/issues/show.html.haml:91:in `_app_views_projects_issues_show_html_haml__4363779578181523868_325530840'
# ./lib/gitlab/i18n.rb:47:in `with_locale'
# ./lib/gitlab/i18n.rb:53:in `with_user_locale'
# ./app/controllers/application_controller.rb:330:in `set_locale'
# ./lib/gitlab/middleware/multipart.rb:93:in `call'
# ./lib/gitlab/request_profiler/middleware.rb:14:in `call'
# ./lib/gitlab/middleware/go.rb:17:in `call'
# ./lib/gitlab/etag_caching/middleware.rb:11:in `call'
# ./lib/gitlab/request_context.rb:18:in `call'
# ./config/initializers/fix_local_cache_middleware.rb:9:in `call'
# ./lib/gitlab/middleware/static.rb:9:in `call'
# ./lib/gitlab/testing/request_blocker_middleware.rb:36:in `call'
# ./lib/gitlab/metrics/requests_rack_middleware.rb:27:in `call'
# ------------------
# --- Caused by: ---
# ArgumentError:
# nil is not a valid asset source
# ./app/helpers/lazy_image_tag_helper.rb:12:in `image_tag'
```
I think the method itself should be refactored in upstream (gitlab-ce):
1. Use one parameter (`lazy`) instead of two (`lazy` and `lazy_load`).
2. Don't call `avatar_icon` which goes to the database (in some cases) if we have `lazy:true`.
3. Pass `lazy` parameter to the `image_tag` from the `link_to_member_avatar`.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [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-org/gitlab-ce/merge_requests/12841Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14687Fix line-height for some events for mobile2017-10-05T17:25:16Zusername-removed-100770Fix line-height for some events for mobile## What does this MR do?
Fix line-height for some events for mobile.
## Are there points in the code the reviewer needs to double check?
No.
While `.event-title` and `.event-item-timestamp` are tuned for PC
in https://gitlab...## What does this MR do?
Fix line-height for some events for mobile.
## Are there points in the code the reviewer needs to double check?
No.
While `.event-title` and `.event-item-timestamp` are tuned for PC
in https://gitlab.com/gitlab-org/gitlab-ce/blob/v10.0.2/app/assets/stylesheets/pages/events.scss#L12-25, `.event-item-timestamp` can be omitted for mobile as it is hidden:
https://gitlab.com/gitlab-org/gitlab-ce/blob/v10.0.2/app/assets/stylesheets/pages/events.scss#L200-202
## Why was this MR needed?
While `line-height` is fine-tuned only for PC (~~!2715~~ **EDIT**: !1239), it is not suitable for mobile.
## Screenshots (if relevant)
| | |
|-|-|
| before | ![dashboard-activity-before](/uploads/2cc39f4416411553a92a960267553c1a/dashboard-activity-before.png) |
| after | ![dashboard-activity-after](/uploads/c77d800ec91e709a890f600b2d7ed6ae/dashboard-activity-after.png) |
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [n/a] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [n/a] API support added
- [n/a] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [x] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #38778username-removed-100770username-removed-100770https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14685Scrollable tabs on top on Admin Jobs/Projects2017-10-06T17:07:43Zusername-removed-100770Scrollable tabs on top on Admin Jobs/Projects## What does this MR do?
This makes tabs on top (vertically) scrollable on Admin Jobs/Projects.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
To improve UX in admin dashboard on m...## What does this MR do?
This makes tabs on top (vertically) scrollable on Admin Jobs/Projects.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
To improve UX in admin dashboard on mobile
## Screenshots (if relevant)
| | |
|-|-|
| before | ![admin-jobs-overflow-before](/uploads/ea4fa5147e4a2d6d17c727864a4e039e/admin-jobs-overflow-before.png) |
| after | ![admin-jobs-overflow-after](/uploads/b473247de6498271375156ed693ca2b3/admin-jobs-overflow-after.png) |
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [n/a] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [n/a] API support added
- [n/a] Tests added for this feature/bug
- Review
- [x] Has been reviewed by UX
- [x] Has been reviewed by Frontend
- [n/a] Has been reviewed by Backend
- [n/a] Has been reviewed by Database
- [x] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #3877510.1Filipa Lacerdafilipa@gitlab.comFilipa Lacerdafilipa@gitlab.comhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14684Display "Groups with access" to <project> for all project members2017-10-06T19:59:38Zusername-removed-1394376Display "Groups with access" to <project> for all project members## What does this MR do?
Gives all project members the visibility to see which groups have access to the specific project.
## Are there points in the code the reviewer needs to double check?
N/A
## Why was this MR needed?
...## What does this MR do?
Gives all project members the visibility to see which groups have access to the specific project.
## Are there points in the code the reviewer needs to double check?
N/A
## Why was this MR needed?
As a non-admin on a project, I am unable to see what groups have access to the project. This makes it incredibly confusing when changes are made by what looks like non project members. And it is also confusing when I can't even see what access I have on a specific project.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#38770username-removed-419655username-removed-419655https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14683WIP: MySQL trigger checks no longer require admin privileges.2017-10-05T13:32:31Zusername-removed-136706WIP: MySQL trigger checks no longer require admin privileges.## What does this MR do?
Current migration code requires MySQL user to have admin rights on the database. The change uses MySQL's `information_schema` tables rather than the restricted `mysql.user` table.
## Are there points in the co...## What does this MR do?
Current migration code requires MySQL user to have admin rights on the database. The change uses MySQL's `information_schema` tables rather than the restricted `mysql.user` table.
## Are there points in the code the reviewer needs to double check?
MySQL `information_schema` is scoped for the user by the looks of it. I have remove the extra scoping and compressed the PostgreSQL grantee into the main method. Not sure if this will work.
I will clean up the unit tests if this change is OK, wanted to get some feedback first.
I also wonder if the unit tests should/could be run with the least privileges needed as I imagine that they are currently running as an admin.
## Why was this MR needed?
To ensure that the GitLab doesn't require MySQL admin rights.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#3837210.0username-removed-136706username-removed-136706https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14661Add sort runners on admin runners2017-10-25T00:07:13Zusername-removed-100770Add sort runners on admin runners## What does this MR do?
Add sort runners by last contacted on admin runners.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
> Admins want to clean up inactive ones from dozens of ...## What does this MR do?
Add sort runners by last contacted on admin runners.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
> Admins want to clean up inactive ones from dozens of the registered runners. For that, sort runners by 'Last contacted' on admin runners would be helpful.
(from #38720)
## Screenshots (if relevant)
![sort-contacted-on-admin-runners](/uploads/b9f1283fc6dc8b6d68a3a90a5bc88582/sort-contacted-on-admin-runners.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [n/a] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [n/a] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #3872010.1username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14653Replaces `tag: true` into `:tag` in the specs2017-10-24T23:58:08Zusername-removed-331646intrip@gmail.comReplaces `tag: true` into `:tag` in the specs## What does this MR do?
- Replaces all the explicit include metadata syntax in the specs `tag:true` into the implicit one `:tag`.
- Added a cop to prevent future errors and handle autocorrection.
## Are there points in the code t...## What does this MR do?
- Replaces all the explicit include metadata syntax in the specs `tag:true` into the implicit one `:tag`.
- Added a cop to prevent future errors and handle autocorrection.
## 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/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [x] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [x] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #3755210.1username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14642namespace should be lowercased in kubernetes2017-10-08T13:23:29Zusername-removed-197097namespace should be lowercased in kubernetes## What does this MR do?
This is making namespace lowercase in kubernetes, otherwise namespaces cannot be created. This was partially addressed, but this covers a case that was missed when the default namespace is generated from the proj...## What does this MR do?
This is making namespace lowercase in kubernetes, otherwise namespaces cannot be created. This was partially addressed, but this covers a case that was missed when the default namespace is generated from the project group-name.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Autodevops fails for projects with uppercase in their name.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38692.10.0username-removed-197097username-removed-197097https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14641Update kubernetes.rb to use strict_encode64 for the certificate. This creates...2017-10-03T12:37:57Zusername-removed-197097Update kubernetes.rb to use strict_encode64 for the certificate. This creates the correct format.## What does this MR do?
Changes the kubernetes certificate-authority-data in the config file in the runner to be rfc4648 compliant.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
The runn...## What does this MR do?
Changes the kubernetes certificate-authority-data in the config file in the runner to be rfc4648 compliant.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
The runner is not working properly failing when it needs to run kubernetes commands. This is due to the KUBECONFIG file using the wrong base64 encoding for the certificate.
Please consider adding a test for this. Clearly this feature was shipped without testing.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [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-org/gitlab-ce/issues/38651https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14631WIP: [FIX] Fixed bug in dropdown selector when selecting the same selection a...2017-10-03T18:27:40Zusername-removed-226601WIP: [FIX] Fixed bug in dropdown selector when selecting the same selection again## What does this MR do?
Fixes a bug related to this issue #38167
## Are there points in the code the reviewer needs to double check?
Though my fix works, I do not know why that `if` statement exists there.
## Why was this M...## What does this MR do?
Fixes a bug related to this issue #38167
## Are there points in the code the reviewer needs to double check?
Though my fix works, I do not know why that `if` statement exists there.
## Why was this MR needed?
Needed to fix a UI bug.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #38167username-removed-226601username-removed-226601https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14621Replace the 'project/merge_requests.feature' spinach test with an rspec analog2017-10-06T16:12:38Zusername-removed-86853blackst0ne.ru@gmail.comReplace the 'project/merge_requests.feature' spinach test with an rspec analog## What does this MR do?
This MR moves all the test from the [features/project/merge_requests.feature](features/project/merge_requests.feature) spinach spec to an rspec analog.
## Additional information
While migrating, I figured out ...## What does this MR do?
This MR moves all the test from the [features/project/merge_requests.feature](features/project/merge_requests.feature) spinach spec to an rspec analog.
## Additional information
While migrating, I figured out there were two scenarios that check the same things:
```ruby
@javascript
Scenario: I comment on a line of a commit in merge request
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
And I click on the commit in the merge request
And I leave a comment like "Line is wrong" on diff in commit
And I switch to the merge request's comments tab
Then I should see a discussion has started on commit diff
@javascript
Scenario: I comment on a commit in merge request
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
And I click on the commit in the merge request
And I leave a comment on the diff page in commit
And I switch to the merge request's comments tab
Then I should see a discussion has started on commit
```
So I removed the former.
---
I removed the scenario
```ruby
@javascript
Scenario: I can close merge request after commenting
Given I visit merge request page "Bug NS-04"
And I leave a comment like "XML attached"
Then I should see comment "XML attached"
And I click link "Close"
Then I should see closed merge request "Bug NS-04"
```
beacuse I think it's overtesting. We already have tests for ability to close a merge request.
## Why was this MR needed?
This is a part of the [spinach removal campaign](https://gitlab.com/gitlab-org/gitlab-ce/issues/23036).
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [x] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [x] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#2303610.1username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14612Add "implements" to the default issue closing message regex2017-10-03T10:49:45Zusername-removed-1616781g.guilhermevieira@gmail.comAdd "implements" to the default issue closing message regex## What does this MR do?
Allows closing an issue by using "implements" in commit message, as suggested by @stavros in #38424. All the following words are allowed: `Implement, Implements, Implemented, Implementing, implement, implement...## What does this MR do?
Allows closing an issue by using "implements" in commit message, as suggested by @stavros in #38424. All the following words are allowed: `Implement, Implements, Implemented, Implementing, implement, implements, implemented, implementing`.
## Are there points in the code the reviewer needs to double check?
You know... regex is always easy to mess things up.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [x] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [x] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #3842410.1username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14610WIP: Renders 404 in commits controller if no commits are found2017-10-24T23:59:27Zusername-removed-1616781g.guilhermevieira@gmail.comWIP: Renders 404 in commits controller if no commits are found## What does this MR do?
Whenever we `show` commits and no commits are found a 404 is going to be rendered. The exception for that is when no `path` is requested and the format is `atom`.
## Why was this MR needed?
@filipa opene...## What does this MR do?
Whenever we `show` commits and no commits are found a 404 is going to be rendered. The exception for that is when no `path` is requested and the format is `atom`.
## Why was this MR needed?
@filipa opened #37620 reporting a white page is rendered when a wrong path is requested.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [x] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [x] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #37620https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14607fix to allow integer label refernces2017-11-14T02:10:06Zusername-removed-1495853fix to allow integer label refernces## What does this MR do?
this fixes the problems with referencing integer labels as in #38075
## Are there points in the code the reviewer needs to double check?
1. I changed the reference pattern in Label model. will it break anythi...## What does this MR do?
this fixes the problems with referencing integer labels as in #38075
## Are there points in the code the reviewer needs to double check?
1. I changed the reference pattern in Label model. will it break anything?
2. Why label id was used in format instead on `:name` in `system_note_service.rb`
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#38075https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14606Fix case sensitive email confirmation on signup2017-10-02T17:22:36Zusername-removed-1654769Fix case sensitive email confirmation on signup## What does this MR do?
This MR fixes a bug where the email confirmation input value is case sensitive. For example, if the email input is `myemail@example.com` and the email confirmation input is `Myemail@example.com` the form would f...## What does this MR do?
This MR fixes a bug where the email confirmation input value is case sensitive. For example, if the email input is `myemail@example.com` and the email confirmation input is `Myemail@example.com` the form would fail to submit.
Interestingly, the inverse was not a bug. If the email input is `Myemail@example.com` and the email confirmation input is `myemail@example.com` the form would **not** fail to submit.
## Are there points in the code the reviewer needs to double check?
Nothing specific :)
## Why was this MR needed?
I ran into this bug while signing up. Since it's a server side validation I had to re-enter my password.
## Screenshots (if relevant)
Before gif:
![Before registration fix](/uploads/7229d8474edc7f3822e1364bffcd497d/2017-09-30_18.51.58.gif)
After gif:
![After registration fix](/uploads/622510857971c2538fce5534681fc67b/2017-09-30_18.47.23.gif)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [-] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [-] API support added
- [-] Tests added for this feature/bug
- 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](https://docs.gitlab.com/ee/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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?10.1Robert SpeicherRobert Speicher