delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix link to index.md in development README.mdux-guide-index	Achilleas Pipinellis	2016-11-12	1	-1/+1
\| \| \| \|	[ci skip]
*	Merge branch '24202-header-ui-improvements' into 'master'	Fatih Acet	2016-11-12	2	-0/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to hover/active/focus states in header items ## What does this MR do? Adds some improvements to buttons, dropdowns, inputs, etc. in the header area. ## Are there points in the code the reviewer needs to double check? I'm not sure. ## Why was this MR needed? Requested in an issue. ## Screenshots (if relevant) ![caret](/uploads/574135282e4b2e81476fdd6dd6c1c05d/caret.gif)![hover](/uploads/15a3b8a2aa89baf20270be97c452e006/hover.gif) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [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? Closes #24202 This is not complete yet. I'm new to this, so please let me know what all steps do I need to do (tests, changelog, etc.). See merge request !7412
\| *	Remove hover state on location badge.	Devesh Khandelwal	2016-11-12	1	-6/+0
\| \|
\| *	Darken more icons on hover and highlight search form also.	Devesh Khandelwal	2016-11-11	2	-0/+14
\| \|
\| *	Darken project selection dropdown caret on hover.	Devesh Khandelwal	2016-11-11	1	-0/+4
\| \|
* \|	Merge branch 'new-note-worker-record-not-found-fix' into 'master'	Sean McGivern	2016-11-12	6	-11/+99
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix record not found error on NewNoteWorker processing Resolves #22678 See merge request !6863
\| * \|	Does not raise error when Note not found when processing NewNoteWorker	Oswaldo Ferreira	2016-11-11	6	-11/+99
\| \| \| \| \| \| \| \| \| \| \| \|	- Also remove unnecessary param
* \| \|	Merge branch 'patch-8' into 'master'	Sean McGivern	2016-11-12	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix Super User spacing See merge request !7433
\| * \| \|	fix Super User spacing	Ben Bodenmiller	2016-11-12	1	-1/+1
\| \|/ /
* \| \|	Merge branch 'patch-11' into 'master'	Sean McGivern	2016-11-12	1	-5/+5
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	update redis server details See merge request !7436
\| * \|	update redis server details	Ben Bodenmiller	2016-11-12	1	-5/+5
\|/ /
* \|	Merge branch '24386-8-14-rc1-requires-quite-amount-of-downtime' into 'master'	Stan Hu	2016-11-11	5	-5/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update 8.14-rc1 migrations to minimize downtime and deploy time ## What does this MR do? Modify 8.14-rc1 migrations and code to minimize downtime and deploy time ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? 8.14-rc1 migrations took too much time in staging, so we didn't want to take too much downtime in production ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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? Closes #24386 See merge request !7427
\| * \|	Update 8.14-rc1 migrations to minimize downtime and deploy time	Alejandro Rodríguez	2016-11-11	5	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/24386
* \| \|	Merge branch '24397-load-labels-on-mr-tabs' into 'master'	Sean McGivern	2016-11-11	3	-0/+30
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure labels are loaded for all "show" methods of MR Controller Closes #24397 See merge request !7416
\| * \| \|	Ensure labels are loaded on "show" methods of MR	Alex Sanford	2016-11-11	3	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, they were only being loaded on the actual `show` action, but not the actions representing the tabs (commits, builds, etc).
* \| \| \|	Merge branch 'sidekiq-job-throttling' into 'master'	Douwe Maan	2016-11-11	16	-1/+178
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow certain Sidekiq jobs to be throttled ## What does this MR do? Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings. ![Screen_Shot_2016-11-04_at_4.51.24_PM](/uploads/a1f1d24c693fcdb278602765cd404d94/Screen_Shot_2016-11-04_at_4.51.24_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Related to #23352 See merge request !7292
\| * \| \| \|	Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttling	Patricio Cano	2016-11-11	6	-23/+20
\| \| \| \| \|
\| * \| \| \|	Refactored initializer code to its own class and added tests	Patricio Cano	2016-11-10	3	-7/+56
\| \| \| \| \|
\| * \| \| \|	Added documentation and CHANGELOG item.	Patricio Cano	2016-11-10	4	-0/+37
\| \| \| \| \|
\| * \| \| \|	Allow the Sidekiq queues to throttle and the factor by which to throttle ↵	Patricio Cano	2016-11-10	8	-13/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	them to be configurable
\| * \| \| \|	Allow certain Sidekiq jobs to be throttled	Patricio Cano	2016-11-10	9	-0/+66
\| \| \| \| \|
* \| \| \| \|	Merge branch 'vue2' into 'master'	Fatih Acet	2016-11-11	41	-9582/+7023
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migration to Vuejs version 2 List of required changes for our Vue usages - `init` :arrow_right: `beforeCreate` - `read` :arrow_right: `mounted` - `$els` :arrow_right: `$refs` - :no_entry_sign: `$remove` completely removed. :white_check_mark: Use `indexOf` and `splice` - :no_entry_sign: HTML embedding with `{{{ }}}` is deprecated. :white_check_mark: Use `v-html` See merge request !7254
\| * \| \| \|	Fixed tests for issue boards & diff note resolvingvue2	Phil Hughes	2016-11-10	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fix Merge Conflicts app to make it work with Vue 2	Alfredo Sumaran	2016-11-10	4	-27/+17
\| \| \| \| \|
\| * \| \| \|	Changed how lists get sorted	Phil Hughes	2016-11-10	3	-2/+6
\| \| \| \| \|
\| * \| \| \|	Issue board spec fixes	Phil Hughes	2016-11-10	3	-2/+4
\| \| \| \| \|
\| * \| \| \|	Fixed jump to discussion button not showing	Phil Hughes	2016-11-10	1	-1/+5
\| \| \| \| \|
\| * \| \| \|	Changed how resolving notes is rendered	Phil Hughes	2016-11-10	4	-35/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue2 was taking the template out & then appending again. This changes that
\| * \| \| \|	Remove unnecesarry require.	Fatih Acet	2016-11-10	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Fixed up resolve discussions	Phil Hughes	2016-11-10	8	-27/+43
\| \| \| \| \|
\| * \| \| \|	Refactor of issue boards to work with Vue2	Phil Hughes	2016-11-10	16	-234/+225
\| \| \| \| \|
\| * \| \| \|	VueJSMigration: Remove parallel-conflict-line component.	Fatih Acet	2016-11-10	3	-20/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's because Vue says: "Component template should contain exactly one root element".
\| * \| \| \|	Vue migration fix syntax highlighting.	Fatih Acet	2016-11-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	VueJS migration, replace {{{ with v-html	Fatih Acet	2016-11-10	2	-5/+3
\| \| \| \| \|
\| * \| \| \|	Migrate Vue v1 to v2.	Fatih Acet	2016-11-10	9	-21/+23
\| \| \| \| \|
\| * \| \| \|	Bump up vue version.	Fatih Acet	2016-11-10	2	-9232/+6672
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ux-guide-restructure' into 'master'	Achilleas Pipinellis	2016-11-11	61	-1/+600
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UX guide restructure The goal of this MR was to update the current UI guide to more of an UX guide (starting to detail when to use certain controls and patterns), and add structure to help organize the information. This initial version of the UX guide also lays down the groundwork for principles and personality. This guide is currently documenting the existing design, and will continue to be updated as the design evolves. Some inspiration/references used: - https://medium.com/ge-design/ges-predix-design-system-8236d47b0891#.nkf0chj8r - http://uxcellence.com/2015/11/04/product-principles/ - https://blog.asana.com/2013/10/design-principles/ See merge request !7142
\| * \| \| \|	Update README.md to link to UX guide	Victor Wu	2016-11-11	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Remove <br> and replace GFM blockquote with the Markdown general	Achilleas Pipinellis	2016-11-11	7	-84/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Rename README.md to index.md	Achilleas Pipinellis	2016-11-11	1	-6/+0
\| \| \| \| \|
\| * \| \| \|	[ci skip] Establish basic structure for ux_guide README.mdux-guide-restructure	awhildy	2016-11-10	60	-1/+676
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Block out pages needed for ux_guide Add resources stub to ux_guide home Fill out principles and basics Add TOC to basics Move all of UI guide to new UX guide structure Add first level structure on ux-guide pages Add more details to buttons Add button images. Update link on development Renamed surfaces to templates. Add tooltip details Update typography and icons on Basics page Add images for color. First draft of voice and tone Delete findings page Refine pages. Fill out Surfaces pages Clean up layout on basics, surfaces, features. Add anchorlinks and counts to components Fill out components page Add item title and system info block Fill out Features page Switch tooltip placement image
* \| \| \| \|	Merge branch '19205-group-header-redesign' into 'master'	Annabel Dunstone Gray	2016-11-11	8	-57/+45
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	19205 Redesign group page header to match new navigation ## What does this MR do? Redesigns group page to match comps ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-08_at_12.50.53_PM](/uploads/6c958e2ab05c1a73c9a96de25490ba2b/Screen_Shot_2016-11-08_at_12.50.53_PM.png) After: ![Screen_Shot_2016-11-08_at_12.50.34_PM](/uploads/822f81df8a0f82a4bdeee3739be5d1f7/Screen_Shot_2016-11-08_at_12.50.34_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [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? Closes #19205 See merge request !7363
\| * \| \| \| \|	19205 Redesign group page header to match new navigation19205-group-header-redesign	tauriedavis	2016-11-09	8	-57/+45
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '21764-build-page-title' into 'master'	Fatih Acet	2016-11-11	5	-8/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove project_title additions from builds and environments ## What does this MR do? Removed soon-to-be un-needed project title additions from builds and environments. This MR depends on !5998, which introduces subnav to these pages. Without it we're just removing a useful link. ## Are there points in the code the reviewer needs to double check? @iamphill Is this right of me? One of these still exists in `projects/artifacts/browse`, I'm not sure whether to fix the issue with `project_title`, which already has some issues with its chevron, or just remove it as it will soon be redundant. ## Why was this MR needed? ## Screenshots (if relevant) BEFORE: ![Screen_Shot_2016-10-27_at_14.58.22](/uploads/2915289fb06603c33d1abbcdab70c962/Screen_Shot_2016-10-27_at_14.58.22.png) AFTER: ![Screen_Shot_2016-10-27_at_14.58.29](/uploads/ad8574aeaa6771737bb9002d749b5559/Screen_Shot_2016-10-27_at_14.58.29.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [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 - [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 you do - 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 #21764 See merge request !6160
\| * \| \| \| \| \|	Removed soon-to-be un-needed project title additions from builds and ↵21764-build-page-title	Luke Bennett	2016-11-09	5	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	environments Removed unneeded `project_title` code and last reference Added CHANGELOG entry
* \| \| \| \| \| \|	Merge branch '23520-mr-sticky-tabs-overlap-discussion-from-anchor' into ↵	Fatih Acet	2016-11-11	2	-2/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Account for fixed position MR when scrolling to elements ## What does this MR do? This MR accounts for the new merge request fixed affix bar when scrolling to an element on the MR page. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The fixed MR tabs bar was not being taken into account when shifting permalink scroll targets so that they are unobscured by navigation elements. ## Screenshots (if relevant) Issues discussion permalink: ![Screen_Shot_2016-10-26_at_12.29.26_AM](/uploads/e278f784252f2b79c466f56b4f36d198/Screen_Shot_2016-10-26_at_12.29.26_AM.png) Merge request discussion permalink: ![Screen_Shot_2016-10-26_at_12.28.26_AM](/uploads/1e57357fffb815b217484f09377f3c23/Screen_Shot_2016-10-26_at_12.28.26_AM.png) Merge request diff permalink: ![Screen_Shot_2016-10-26_at_12.29.02_AM](/uploads/269f3a4a4075932355f665322387db86/Screen_Shot_2016-10-26_at_12.29.02_AM.png) Commit diff page permalinks work as well, but aren't highlighted currently (see: #23696) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [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? Closes #23520 See merge request !7051
\| * \| \| \| \| \| \|	Account for merge request fixed affix bar23520-mr-sticky-tabs-overlap-discussion-from-anchor	Luke Bennett	2016-11-10	2	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	account for merge request fixed affix bar when adjusting scroll targets
* \| \| \| \| \| \| \|	Merge branch '22699-group-permssion-background-migration' into 'master'	Yorick Peterse	2016-11-11	3	-1/+54
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project records with invalid visibility_level values See merge request !7391
\| * \| \| \| \| \| \| \|	Fix project records with invalid visibility_level values	Nick Thomas	2016-11-10	3	-1/+54
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The AddVisibilityLevelToGroups migration introduced a visibility_level for namespaces and specified that projects should always have a visibility level less than or equal to their namespace. However, some invalid rows could have been created. This commit introduces a migration that updates the invalid rows, setting the invalid project to have the same visibility_level as their namespaces. This will make some projects internal or private when they would previously have been public or internal, but this is better than silently making an internal or private group public.
* \| \| \| \| \| \| \|	Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master'	Sean McGivern	2016-11-11	7	-4/+23
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the collapsed diff when converting a symlink to a regular file #21610 !6828 See merge request !6953