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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[ci skip] Update "Installation from source" guide for 8.15.0update/installation-from-source-guide-8-15	Douglas Barbosa Alexandre	2016-12-09	2	-3/+3
\|
*	Merge branch 'api-remove-source-branch' into 'master'	Rémy Coutable	2016-12-09	1	-23/+26
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to remove source branch Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23577 See merge request !7804
\| *	API: Ability to remove source branchapi-remove-source-branch	Robert Schilling	2016-12-04	1	-23/+26
\| \|
* \|	Merge branch 'issue_25152_docs' into 'master'	Achilleas Pipinellis	2016-12-09	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update JIRA troubleshoot documentation closes #25152 See merge request !7977
\| * \|	Update JIRA troubleshoot documentationissue_25152_docs	Felipe Artur	2016-12-08	1	-0/+1
\| \| \|
* \| \|	Merge branch '22152-improve-setup-ssh-documentation' into 'master'	Achilleas Pipinellis	2016-12-09	1	-80/+117
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to setting up SSH documentation ## What does this MR do? Improves the documentation article on setting up SSH. * Added introduction * Added additional explanations * Added sub headings * Moved sections around * Added section about generating an SSH key pair on Windows with PuttyGen (will be expanded further in future) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24708 See merge request !6571
\| * \| \|	Refactor SSH keys docs	Achilleas Pipinellis	2016-12-09	1	-65/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Improvements to setting up ssh	Sean Packham	2016-12-09	1	-61/+93
\| \|/ /
* \| \|	Merge branch 'zj-update-chatops-docs' into 'master'	Sean Packham	2016-12-09	2	-2/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs to reflect new defaults on omnibus ## What does this MR do? Updates docs, after gitlab-org/omnibus-gitlab!1154 the flow has changed. See merge request !8006
\| * \| \|	Update docs to reflect new defaults on omnibuszj-update-chatops-docs	Z.J. van de Weg	2016-12-09	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For mattermost chat commands, new defaults are set in the next release making configuring easier. This commit reflects that in the doc. [ci skip]
* \| \| \|	Updating reference to database password1392-honor-database-password	Ian Baum	2016-12-08	1	-2/+2
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	postgresql['sql_password'] is not used, should be gitlab_rails['db_password']
* \| \|	Merge branch 'rs-8-15-update-guide' into 'master'	Rémy Coutable	2016-12-08	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct previous stable branch used in 8.14 to 8.15 update guide [ci skip] See merge request !7984
\| * \| \|	Correct previous stable branch used in 8.14 to 8.15 update guiders-8-15-update-guide	Robert Speicher	2016-12-08	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'public-tags-api' into 'master' 19703-direct-link-pipelines-into-builds	Douwe Maan	2016-12-08	1	-2/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow public access to some Tag API endpoints Continuation of #4269. See merge request !7896
\| * \| \| \|	Allow public access to some Tag API endpointspublic-tags-api	Rémy Coutable	2016-12-07	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch '24537-reenable-private-token-with-sudo' into 'master'	Douwe Maan	2016-12-08	1	-1/+50
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reenables /user API request to return private-token if user is admin and requested with sudo ## What does this MR do? Reenables the API /users to return `private-token` when sudo is either a parameter or passed as a header and the user is admin. ## Screenshots (if relevant) Without sudo: ![Screen_Shot_2016-11-21_at_11.44.49](/uploads/ebecf95dbadaf4a159b80c61c75771d9/Screen_Shot_2016-11-21_at_11.44.49.png) With sudo: ![Screen_Shot_2016-11-21_at_11.45.52](/uploads/f25f9ddffcf2b921e9694e5a250191d3/Screen_Shot_2016-11-21_at_11.45.52.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - 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 #24537 See merge request !7615
\| * \| \| \|	adds impersonator variable and makes sudo usage overall more clear24537-reenable-private-token-with-sudo	tiagonbotelho	2016-12-07	1	-1/+50
\| \| \| \| \|
* \| \| \| \|	Merge branch '24565-fix-api-example-typos' into 'master'	Rémy Coutable	2016-12-07	2	-9/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in API doc examples ## What does this MR do? Fixes a typo in the API docs. The `curl` examples in [build_triggers.md](doc/api/build_triggers.md) and [build_variables.md](doc/api/build_variables.md) all have a typo in the auth header. They all say `PRIVATE_TOKEN` when it should be `PRIVATE-TOKEN`. ## What are the relevant issue numbers? Fixes #24565 See merge request !7514
\| * \| \| \| \|	Fix typos in API doc examples	Ryan O'Boyle	2016-11-16	2	-9/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/link-update-university' into 'master'	Sean Packham	2016-12-07	1	-6/+6
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GLU index for new report, broken links + typos ## What does this MR do? Update text on GLU documentation for spelling and new State of DevOps book. /cc @axil See merge request !7962
\| * \| \| \| \|	new DevOps report, 404s, typos	ja-me-sk	2016-12-06	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correct heading level for topics Update puppet dev ops report for 2016
* \| \| \| \| \|	Merge branch 'update-git-version-in-doc' into 'master'	Marin Jankovski	2016-12-07	1	-4/+4
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Git version requirement to 2.8.4 Following gitlab-org/omnibus-gitlab!1108, the install doc and README should be updated too. See merge request !7878
\| * \| \| \| \|	Bump Git version requirement to 2.8.4update-git-version-in-doc	Rémy Coutable	2016-12-01	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'ux-guide-animation' into 'master'	Achilleas Pipinellis	2016-12-07	7	-22/+56
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UX Guide - add initial animation guidance Adding guidance to our UX Guide around animation. This is to help us implement #24831 and add polished, consistent animation throughout GitLab. See merge request !7780
\| * \| \| \| \| \|	Create animation page and clean up indexux-guide-animation	awhildy	2016-12-05	7	-22/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add guidance on timings and easing [ci skip] Detail when not to use easing Add dropdown and hover examples Add quick update animation
* \| \| \| \| \| \|	Merge branch 'patch-7' into 'master'	Achilleas Pipinellis	2016-12-07	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update php.md - /.dockerinit was removed in v1.11 so the test always results in … See merge request !7882
\| * \| \| \| \| \| \|	Update php.md - /.dockerinit was removed in v1.11 so the test always results ↵	Sam Carrington	2016-12-01	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in an early exit https://github.com/docker/docker/pull/19490
* \| \| \| \| \| \|	Update custom_hooks.md for global custom hooks and chained hook info	Elan Ruusamäe	2016-12-06	1	-0/+20
\| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/93
* \| \| \| \| \|	Merge branch '23589-open-issue-for-mr' into 'master'	Sean McGivern	2016-12-06	3	-2/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create an issue for all unresolved discussions in an MR See merge request !7180
\| * \| \| \| \| \|	Feature: delegate all open discussions to Issue	Bob Van Landuyt	2016-12-05	3	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue.
* \| \| \| \| \| \|	Merge branch 'glm-shorthand-reference' into 'master'	Sean McGivern	2016-12-06	1	-0/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GLM shorthand reference for projects from the same namespace Closes #21679 See merge request !7255
\| * \| \| \| \| \| \|	Update user markdown docs with cross-project shorthand version	Oswaldo Ferreira	2016-12-02	1	-0/+12
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'document-public-project-api' into 'master'	Douwe Maan	2016-12-06	1	-4/+44
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the public Project API and document `GET /projects/:id/users` Documentation was not updated in !7843. Also the `GET /projects/:id/users` endpoint was not documented at all! See merge request !7897
\| * \| \| \| \| \| \|	Document the public Project API and document `GET /projects/:id/users`document-public-project-api	Rémy Coutable	2016-12-02	1	-4/+44
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'fix-nignx-typo' into 'master'	Achilleas Pipinellis	2016-12-05	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NIGNX -> Nginx This shouldn't be in all caps, and it should be spelled correctly! See merge request !7929
\| * \| \| \| \| \|	NIGNX -> Nginxfix-nignx-typo	Sean McGivern	2016-12-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This shouldn't be in all caps, and it should be spelled correctly!
* \| \| \| \| \| \|	It's secret variables, not secure	Achilleas Pipinellis	2016-12-05	1	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'docs/refactor-ci-variables' into 'master'	Achilleas Pipinellis	2016-12-05	3	-61/+218
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor CI variables docs See merge request !7751
\| * \| \| \| \| \| \|	Fix dead links, add example of debug trace output, simplify titles	Achilleas Pipinellis	2016-12-05	2	-27/+147
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Refactor CI variables docsdocs/refactor-ci-variables	Achilleas Pipinellis	2016-11-25	3	-49/+86
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Document button secondary states. Update icons and color section	Chris Peressini	2016-12-05	35	-35/+36
\| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Describe hover, focus and active states for primary and secondary buttons. Organized the icons section in a table. Replaced images for icons so they are all the same size. Organized the color section in a table. Replaced the images with new ones so the table would have a more manageable size. Updated the values for some colors to show the $color-light shade. Remove commented sections Remove `db/schema.rb` Add db/schema.rb from origin/master Fix typos
* \| \| \| \| \| \|	Merge branch 'zj-use-ruby-2-3-3' into 'master'	Sean McGivern	2016-12-05	1	-3/+3
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump ruby version to 2.3.3 Part of gitlab-org/gitlab-ce#24629 See merge request !7904
\| * \| \| \| \| \|	Bump ruby versionzj-use-ruby-2-3-3	Z.J. van de Weg	2016-12-03	1	-3/+3
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master'	Kamil Trzciński	2016-12-05	8	-56/+61
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename MWBS service to Merge When Pipeline Succeeds ## What does this MR do? This MR renames Merge When Build Succeeds feature to Merge When Pipeline Succeeds, because we recently changed the behavior, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6675. ## 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) - [x] All builds are passing ## What are the relevant issue numbers? Closes #23354 See merge request !7135
\| * \ \ \ \ \	Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds	Grzegorz Bizon	2016-11-30	24	-211/+331
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (110 commits) Rewrite an HTTP link to use HTTPS Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90ac Add blue back to sub nav active Remove JSX/React eslint plugins. Fix a transient spec failure Adds hoverstates for collapsed Issue/Merge Request sidebar Moved groups above projects Add StackProf to the Gemfile, along with a utility to get a profile for a spec Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1 Add a CHANGELOG entry Alert user when logged in user email is not the same as the invitation Expose timestamp in build entity used by serializer Rename `MergeRequest#pipeline` to `head_pipeline` Remove unnecessary database indexes CE-specific changes gitlab-org/gitlab-ee#1137 Fixing typo & Clarifying Key name fix started_at check fix blob controller spec failure - updated not to use file-path- fix blob controller spec failure Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' ... Conflicts: app/controllers/projects/merge_requests_controller.rb lib/api/merge_requests.rb spec/requests/api/merge_requests_spec.rb
\| * \| \| \| \| \| \|	Move MWPS document to new location	Achilleas Pipinellis	2016-11-29	6	-49/+54
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds	Grzegorz Bizon	2016-11-25	431	-187/+491
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (312 commits) Fix bad selection on dropdown menu for tags filter Fixed issue boards scrolling with a lot of lists & issues You can only assign default_branch when editing a project ... Don't convert data which already is the target type Stop supporting Google and Azure as backup strategies renames some of the specs and adds changelog entry Fixed dragging issue moving wrong issue after multiple drags of issue Fixed issue boards issue sorting when dragging issue into list Rephrase some system notes to be compatible with new system note style Add missing JIRA file that redirects to the new location Fix documentation to create the `pg_trm` extension before creating the DB Document that we always use `do...end` for `before` in RSpec Backport Note#commands_changes from EE Log mv_namespace parameters Add default_branch attr to Project API payload in docs. Fix title case to sentence case properly escape username validation error message flash Remove header ids from University docs Add missing documentation. Added test that checks the correct select box is there for the LFS ... ... Conflicts: app/services/system_note_service.rb spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb spec/services/system_note_service_spec.rb
\| * \| \| \| \| \| \| \|	Update some docs to reflect MWPS name change	Grzegorz Bizon	2016-11-21	6	-18/+18
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '25148_fix_gfm_typo' into 'master'	Achilleas Pipinellis	2016-12-04	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gfm doc typo about two spaces for next line transfer Fixes #25148 See merge request !7915
\| * \| \| \| \| \| \| \|	fix gfm doc typo about two spaces for next line transfer	Rydkin Maxim	2016-12-03	1	-2/+2
\| \| \| \| \| \| \| \| \|