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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use unicode in CIunicode-ci	Achilleas Pipinellis	2016-06-27	1	-1/+6
\|
*	Merge branch 'fix-settings-spec' into 'master'	Stan Hu	2016-06-24	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix settings_spec so that it can that run by itself Running `spec/settings_spec.rb` would fail because it would attempt to load `1_settings.rb`, which would reference `Rails`. This constant was not loaded without `spec_helper.rb`. See merge request !4893
\| *	Fix settings_spec so that it can that run by itselffix-settings-spec	Stan Hu	2016-06-23	1	-0/+1
\| \|
* \|	Merge branch 'hamlit-test' into 'master'	Robert Speicher	2016-06-23	8	-28/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace Haml with Hamlit What this change does: - It replaces HAML with [Hamlit](https://github.com/k0kubun/hamlit), a much more efficient implementation of HAML. - It removes `haml-rails`. - It adds `hamlit.rb` and removes `haml.rb`. - It makes things faster and less memory-hungry! See also #13201. See merge request !3666
\| * \|	Restrict hamlit version, remove coffeescript filters.	Connor Shea	2016-06-23	5	-5/+7
\| \| \|
\| * \|	Add changelog entry.	Connor Shea	2016-06-22	1	-0/+1
\| \| \|
\| * \|	Remove Haml helpers from the visibility level spec.	Connor Shea	2016-06-22	1	-5/+0
\| \| \|
\| * \|	Replace Haml with Hamlit.	connorshea	2016-06-22	5	-22/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hamlit is a library that's faster than Haml while implementing most of its features: https://github.com/k0kubun/hamlit Not sure if this breaks anything, but as far as I can tell most things work the same. No obvious regressions that I've been able to find.
* \| \|	Merge branch 'zj-pipeline-can-be-nil'	Douwe Maan	2016-06-23	2	-2/+8
\|\ \ \
\| * \| \|	Check if pipeline is nil before mergingzj-pipeline-can-be-nil	Z.J. van de Weg	2016-06-23	2	-2/+10
\| \| \| \|
* \| \| \|	Merge branch 'fix-logo' into 'master'	Jacob Schatz	2016-06-23	1	-1/+0
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove width restriction for logo on sign-in page. Follow-up on !4661 since we didn't remove the width restriction on that. See merge request !4888
\| * \| \|	Remove width restriction for logo on sign-in page.	Connor Shea	2016-06-23	1	-1/+0
\| \| \| \|
* \| \| \|	Merge branch '18438-ios-scrolling' into 'master'	Jacob Schatz	2016-06-23	8	-125/+109
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Scrolling horz on iOS for the secondary nav is broken" ## What does this MR do? Moves absolutely positioned `div`s outside of the scrolling container because mobile safari causes those elements to jump around on scroll. ## Are there points in the code the reviewer needs to double check? Check on a real iPhone (was only able to check in iOS simulator) ## Why was this MR needed? Mobile Safari. ## What are the relevant issue numbers? Closes #18438 ## Screenshots (if relevant) ![mobile-safari-fix](/uploads/b38bba735530eb11507fe03036292dd8/mobile-safari-fix.gif) See merge request !4869
\| * \| \|	Update changelog	Annabel Dunstone	2016-06-23	1	-0/+1
\| \| \| \|
\| * \| \|	Fix positioning of Repository sub nav scrolling	Annabel Dunstone	2016-06-23	2	-1/+20
\| \| \| \|
\| * \| \|	Move fade divs out of every scrolling container; remove unneeded scrolling CSS	Annabel Dunstone	2016-06-23	5	-114/+61
\| \| \| \|
\| * \| \|	Move fade out divs outside of scrolling container on project view	Annabel Dunstone	2016-06-23	3	-19/+36
\| \| \| \|
* \| \| \|	Merge branch '19008_ci_dropdown_label_fix' into 'master'	Jacob Schatz	2016-06-23	3	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply selected value as label ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) ![dropdown-label](/uploads/db2ea7cb3cc51fbdeea53c304f1bd7a5/dropdown-label.gif) ## Does this MR meet the acceptance criteria? - [ ] [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 - [x] Added for this feature/bug - [x] All builds are passing - [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) See merge request !4886
\| * \| \| \|	Update tests to check if label is set after picking a template19008_ci_dropdown_label_fix	Alfredo Sumaran	2016-06-23	2	-0/+2
\| \| \| \| \|
\| * \| \| \|	Apply selected value as label	Alfredo Sumaran	2016-06-23	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-bulk-assign' into 'master'	Jacob Schatz	2016-06-23	5	-8/+173
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix unwanted label unassignment ## What does this MR do? - When updating the milestone - [x] Do not remove labels when assigning a milestone - [x] Do not remove labels when unassigning a milestone - [x] Do not remove labels when assigning a milestone and adding another label - When toggling selected issues labels should be kept - [x] Select an issue with an assigned label -> pick another label from dropdown-> unselect the issue -> select the issue again -> submit the form: Existing label should not be removed. ## Are there points in the code the reviewer needs to double check? Labels should not be added or removed to issues when doing bulk actions unless we explicitly select a label from the dropdown ## 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 - [x] Added for this feature/bug - [x] All builds are passing - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4863
\| * \| \| \|	Update CHANGELOG	Alfredo Sumaran	2016-06-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Use instance property to enable/disable label assignment	Alfredo Sumaran	2016-06-23	3	-12/+3
\| \| \| \| \|
\| * \| \| \|	Update CHANGELOG	Alfredo Sumaran	2016-06-23	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add tests to check fixes	Alfredo Sumaran	2016-06-23	1	-3/+148
\| \| \| \| \|
\| * \| \| \|	Disable Label update when no issues are selected	Alfredo Sumaran	2016-06-23	1	-1/+7
\| \| \| \| \|
\| * \| \| \|	Apply labels only if we picked a label from the dropdown	Alfredo Sumaran	2016-06-23	2	-4/+26
\| \| \| \| \|
* \| \| \| \|	Merge branch '18536_status_dropdown_label' into 'master'	Jacob Schatz	2016-06-23	2	-4/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set button label when picking an option from status dropdown ## What does this MR do? Fixes an issue with the status dropdown. It was not setting up the correct label after picking an option ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18536 ## Screenshots (if relevant) Previous ![status-select-previous](/uploads/7c6adbd6c5ba2660dc39a762d53d3b68/status-select-previous.gif) After ![status-select](/uploads/91483efed8fbd63a79a01c9ca2154b74/status-select.gif) ## Does this MR meet the acceptance criteria? - [ ] [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 - [x] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4771
\| * \| \| \| \|	Update dropdown text accordingly to selected item18536_status_dropdown_label	Alfredo Sumaran	2016-06-17	1	-0/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Pass dropdown instance to toggleLabel callback	Alfredo Sumaran	2016-06-17	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ref-dropdown-jquery-objects' into 'master'	Jacob Schatz	2016-06-23	2	-12/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use jQuery objects in ref dropdown ## What does this MR do? Keeps the behaviour the same as the ref dropdown, however it now uses jQuery objects to handle the HTML creation instead of passing strings around. It pretty much worked out the box so not much was changed in the dropdowns themselves. Will be easy to transfer this over to other dropdown menus as well. cc. @jschatz1 @rspeicher @DouweM Do we want this to go into a patch release? See merge request !4850
\| * \| \| \| \| \|	Updated to add parenthesesref-dropdown-jquery-objects	Phil Hughes	2016-06-22	2	-7/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Empty the content before append anything to the dropdown	Phil Hughes	2016-06-22	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use jQuery objects in ref dropdown	Phil Hughes	2016-06-22	2	-12/+16
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'optimize-award-emoji' into 'master'	Yorick Peterse	2016-06-23	5	-12/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eager load award emoji on notes and participants See merge request !4628
\| * \| \| \| \| \| \|	Preload notes/discussions associations (award_emoji: :user)optimize-award-emoji	Paco Guzman	2016-06-23	6	-14/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Eager load award emoji on notes	Z.J. van de Weg	2016-06-23	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit eager loads the award emoji on both the issues and the MRs. When loading an issue with 108 comments this reduces the query count by 327 queries. On a merge request with the same amount of comments this saves 148 queries. The large difference is not clear to me at this point and the total query count is still huge with 387 and 1034 respectively. The biggest problem however, remains the calculation of participants.
* \| \| \| \| \| \| \|	Merge branch '18569-fix-diff-note-position' into 'master'	Robert Speicher	2016-06-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore old behavior around diff notes to outdated discussions Fixes #18569 See merge request !4870
\| * \| \| \| \| \| \|	Restore old behavior around diff notes to outdated discussions	Douwe Maan	2016-06-22	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'bump-gitlab-git-10-2-1' into 'master'	Stan Hu	2016-06-23	2	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab_git to 10.2.3 to fix false truncated warnings with ISO-8559 files Closes #18690 See merge request !4884
\| * \| \| \| \| \| \| \|	Bump gitlab_git to 10.2.3	Stan Hu	2016-06-23	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bump gitlab_git to 10.2.1 to fix false truncated warnings with ISO-8559 files	Stan Hu	2016-06-23	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18690
* \| \| \| \| \| \| \| \|	Merge branch 'document-emoji-rake-tasks' into 'master'	Achilleas Pipinellis	2016-06-23	1	-0/+20
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added basic docs for the Emoji Rake tasks ## What does this MR do? This MR adds basic documentation for the two Emoji Rake tasks. ## Are there points in the code the reviewer needs to double check? Spelling, that sort of thing. ## Why was this MR needed? These Rake tasks only had some small amount of source level documentation. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/14794 ## Does this MR meet the acceptance criteria? - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] 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) See merge request !4877
\| * \| \| \| \| \| \| \|	Added basic docs for the Emoji Rake tasksdocument-emoji-rake-tasks	Yorick Peterse	2016-06-23	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#14794 gitlab-com/performance#13 [ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'issue_14563' into 'master'	Rémy Coutable	2016-06-23	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix user creation with stronger minimum password requirements ## What does this MR do? `doc/security/password_length_limits.md` Describes a way to increase minimum requirements of passwords, via `config/initializers/devise_password_length.rb`. However, user creation hardcoded password generation at 8 characters. If the minimum was set at any more than 8 characters, user creation will fail. Function now looks up minimum length requirement. ## What are the relevant issue numbers? Fixes #14563. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 - [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) See merge request !4054
\| * \| \| \| \| \| \| \|	Fix user creation with stronger minimum password requirements:q	Nathan Bush	2016-06-23	2	-1/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'merge-settings-help-link' into 'master'	Stan Hu	2016-06-23	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix merge requests project settings help link anchor. ## What does this MR do? 8.9.0 added a new project option for merge requests which has a link for help. The link contained an anchor which was being encoded as ```%23``` so change the help link to properly configure the anchor. ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Current release causes 404 error when clicking on the help link in project settings. ## What are the relevant issue numbers? Closes #18982 ## Screenshots (if relevant) ## 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 [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) See merge request !4873
\| * \| \| \| \| \| \| \| \|	Fix merge requests project settings help link anchor.	Steve Norman	2016-06-23	2	-1/+2
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '18924-gitlab-ce-tags-page-is-not-working-502-read-timeout' ↵	Yorick Peterse	2016-06-23	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Use memorized tags array when searching tags by name See merge request !4859
\| * \| \| \| \| \| \| \|	Improve performance of searching tags by name by using a memorized tag array18924-gitlab-ce-tags-page-is-not-working-502-read-timeout	Alejandro Rodríguez	2016-06-23	2	-1/+2
\|/ / / / / / / /