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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-pdflab-paths' into 'master'	Jacob Schatz	2017-04-12	2	-156/+171
\|\ \| \| \| \| \| \| \| \|	Fix pdflab code including file paths See merge request !10632
\| *	Fix pdflab code including file pathsfix-pdflab-paths	Sam Rose	2017-04-11	2	-156/+171
\| \|
* \|	Merge branch 'change-merged-icon' into 'master'	Jacob Schatz	2017-04-12	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update merged icon See merge request !10635
\| * \|	Update merged iconchange-merged-icon	Annabel Dunstone Gray	2017-04-11	1	-1/+1
\| \| \|
* \| \|	Merge branch 'zero-downtime-migrations' into 'master'	Douwe Maan	2017-04-12	8	-77/+1071
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare for zero downtime migrations See merge request !9976
\| * \| \|	Prepare for zero downtime migrationszero-downtime-migrations	Yorick Peterse	2017-04-12	8	-77/+1071
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Starting with GitLab 9.1.0 we will no longer allow downtime migrations unless absolutely necessary. This commit updates the various developer guides and adds code that is necessary to make zero downtime migrations less painful.
* \| \| \|	Merge branch 'fix-preloading-merge_request_diff' into 'master'	Stan Hu	2017-04-12	2	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use preload to avoid Rails using JOIN See merge request !10666
\| * \| \| \|	Add changelog entry	Lin Jen-Shin	2017-04-13	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Use preload to avoid Rails using JOIN	Lin Jen-Shin	2017-04-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/26786/
* \| \| \| \|	Merge branch 'reset-new-branch-button' into 'master'	Alfredo Sumaran	2017-04-12	3	-136/+170
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset New branch button when issue state changes Closes #21292 See merge request !5962
\| * \| \| \| \|	Reset New branch button when issue state changes	💃 Winnie 💃	2017-04-12	3	-136/+170
\|/ / / / /
* \| \| \| \|	Merge branch 'patch-15' into 'master'	Achilleas Pipinellis	2017-04-12	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to environments on kubernetes.md See merge request !10555
\| * \| \| \| \|	Add link to environments on kubernetes.md	Mark Pundsack	2017-04-12	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch '27729-improve-webpack-dev-environment' into 'master'	Alfredo Sumaran	2017-04-12	6	-8/+45
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve webpack-dev-server compatibility with non-localhost setups. Closes #27729 See merge request !10604
\| * \| \| \| \|	Improve webpack-dev-server compatibility with non-localhost setups.	Mike Greiling	2017-04-12	6	-8/+45
\|/ / / / /
* \| \| \| \|	Merge branch '2120-issues-search-bar-not-picking-up' into 'master'	Annabel Dunstone Gray	2017-04-12	2	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix filtered search input width for IE Closes #30856 See merge request !10662
\| * \| \| \| \|	Fix filtered search input width for IE	Clement Ho	2017-04-12	2	-1/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-add-auth-to-topics-page' into 'master'	Marcia Ramos	2017-04-12	2	-4/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add auth to topics page See merge request !10643
\| * \| \| \| \| \|	fix broken linkdocs-add-auth-to-topics-page	Marcia Ramos	2017-04-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix ee links	Marcia Ramos	2017-04-12	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add line to the end of the file	Marcia Ramos	2017-04-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add auth to topics page	Marcia Ramos	2017-04-12	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-missing-capitalisation-buttons' into 'master'	Clement Ho	2017-04-12	2	-4/+8
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed missing capitalisation on buttons See merge request !10631
\| * \| \| \| \| \|	Fixed missing help ui view capitalisation buttonsfix-missing-capitalisation-buttons	Jose Ivan Vargas	2017-04-11	2	-4/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'poll-test-fix' into 'master'	Filipa Lacerda	2017-04-12	1	-36/+57
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed random failures with Poll spec Closes #30824 See merge request !10654
\| * \| \| \| \| \|	Fixed random failures with Poll specpoll-test-fix	Phil Hughes	2017-04-12	1	-36/+57
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly waits for requests to finish before testing anything. Previously it was waiting for a set amount of time which could possibly cause failures dependant on how quickly these execute Stops any polling requests once done so that the error callback doesn't get called with a 404 Closes #30824
* \| \| \| \| \|	Merge branch 'fix_spaces_in_label_title' into 'master'	Sean McGivern	2017-04-12	3	-0/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove heading and trailing spaces from label's color and title See merge request !10603
\| * \| \| \| \| \|	Remove heading and trailing spaces from label's color and title	blackst0ne	2017-04-12	3	-0/+26
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'contributing-ci-templates' into 'master'	Rémy Coutable	2017-04-12	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates See merge request !10653
\| * \| \| \| \| \| \|	Include CONTRIBUTING.md file when importing .gitlab-ci.yml templatescontributing-ci-templates	Adam Niedzielski	2017-04-12	2	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'improve-testing-documentation' into 'master'	Robert Speicher	2017-04-12	2	-99/+375
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the testing documentation Closes #29499 and #29623 See merge request !10161
\| * \| \| \| \| \| \| \|	Improve the testing documentationimprove-testing-documentation	Rémy Coutable	2017-04-12	1	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fix link again	Rémy Coutable	2017-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fix path to migrations	Rémy Coutable	2017-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fix wrong link	Rémy Coutable	2017-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Re-organize testing doc, and add RSpec structure doc	Rémy Coutable	2017-04-10	2	-89/+165
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Document GitLab QA	Rémy Coutable	2017-04-10	1	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Improve testing documentation with Robert's feedback	Rémy Coutable	2017-04-10	2	-37/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Firs pass at improving the testing documentation	Rémy Coutable	2017-04-10	2	-31/+194
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'user-activity-scroll-bar' into 'master'	Annabel Dunstone Gray	2017-04-12	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set user contribution calendar `overflow-x: scroll` more precisely Closes #30738 See merge request !10636
\| * \| \| \| \| \| \| \| \|	Let browser set overflow-x scroll on user activity calendar.user-activity-scroll-bar	Bryce Johnson	2017-04-11	2	-1/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '29056-backport-ee-cleanup-database-file' into 'master'	Douwe Maan	2017-04-12	17	-20/+75
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removes redundant code from database.rb Closes #29056 See merge request !10583
\| * \| \| \| \| \| \| \| \| \|	removes redundant code from database.rb29056-backport-ee-cleanup-database-file	Tiago Botelho	2017-04-11	17	-20/+75
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'improve-discussions-feature-attempt-1' into 'master'	Douwe Maan	2017-04-12	5	-94/+78
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve discussion_comments_spec perf See merge request !10648
\| * \| \| \| \| \| \| \| \| \|	Separate examples for each otherimprove-discussions-feature-attempt-1	Luke "Jared" Bennett	2017-04-12	5	-64/+66
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Collapse similar sibling scenarios	Luke "Jared" Bennett	2017-04-12	1	-41/+12
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use empty_project for resources that are independent of the repo	Luke "Jared" Bennett	2017-04-12	1	-7/+18
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-8' into 'master'	Rémy Coutable	2017-04-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar See merge request !10639
\| * \| \| \| \| \| \| \| \| \|	Fix grammar	Ismail S	2017-04-11	1	-2/+2
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '27755-update-pipelines-documentation' into 'master' 30843-move-about-gitlab-com-installation-instructions-to-documentation	Sean Packham (GitLab)	2017-04-12	1	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update Pipelines documentation" Closes #27755 See merge request !10600