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

	Commit message (Collapse)	Author	Age	Files	Lines
*	added project_new importdispatcher-projects	Phil Hughes	2018-01-17	3	-3/+3
\|
*	fixed specs	Phil Hughes	2018-01-16	3	-3/+111
\|
*	removed console.log	Phil Hughes	2018-01-16	1	-1/+0
\|
*	fixed shortcuts not working on some pages	Phil Hughes	2018-01-16	3	-7/+5
\|
*	Added dispatcher imports for some project routes	Phil Hughes	2018-01-16	20	-156/+52
\|
*	Merge branch 'print-list-of-available-backups' into 'master'	Douwe Maan	2018-01-16	2	-1/+14
\|\ \| \| \| \| \| \| \| \|	List backups avilable for restore See merge request gitlab-org/gitlab-ce!16465
\| *	Check for both backup filesprint-list-of-available-backups	Balasankar "Balu" C	2018-01-16	1	-1/+1
\| \|
\| *	Imitate other specs	Balasankar "Balu" C	2018-01-16	1	-1/+1
\| \|
\| *	Try one expectation only	Balasankar "Balu" C	2018-01-16	1	-2/+0
\| \|
\| *	Move conditional to a separate method	Balasankar "Balu" C	2018-01-15	1	-3/+5
\| \|
\| *	Run the code to be tested	Balasankar "Balu" C	2018-01-15	1	-0/+1
\| \|
\| *	List available backups for restore	Balasankar "Balu" C	2018-01-15	2	-1/+13
\| \|
* \|	Merge branch 'dispatcher-projects-c' into 'master'	Phil Hughes	2018-01-16	8	-41/+85
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	dispatcher changes for projects:c* views See merge request gitlab-org/gitlab-ce!16416
\| * \|	typodispatcher-projects-c	Simon Knox	2018-01-16	1	-1/+1
\| \| \|
\| * \|	add missing pages import for projects:compare:*	Simon Knox	2018-01-16	2	-2/+8
\| \| \|
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Simon Knox	2018-01-16	92	-873/+2072
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	dispatcher-projects-c
\| * \| \|	fix exports	Simon Knox	2018-01-15	2	-2/+6
\| \| \| \|
\| * \| \|	fix broken import path from merge	Simon Knox	2018-01-15	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Simon Knox	2018-01-15	92	-919/+1180
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dispatcher-projects-c
\| * \| \| \|	export instances	Simon Knox	2018-01-12	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	remove unused	Simon Knox	2018-01-12	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	dispatcher pages for projects:clusters	Simon Knox	2018-01-12	3	-12/+12
\| \| \| \| \|
\| * \| \| \|	dispatcher changes for projects:commit* views	Simon Knox	2018-01-12	5	-24/+59
\| \| \| \| \|
* \| \| \| \|	Merge branch '42046-fork-icon' into 'master'41936-install-btn	Fatih Acet	2018-01-16	3	-3/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Icons on forks page are to big" Closes #42046 See merge request gitlab-org/gitlab-ce!16474
\| * \| \| \| \|	Resolve "Icons on forks page are to big"	Simon Knox	2018-01-16	3	-3/+8
\|/ / / / /
* \| \| \| \|	Merge branch '41796-update-auto-deployed-prometheus-scrape-config' into 'master'	Kamil Trzciński	2018-01-16	1	-119/+81
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update auto-deployed prometheus scrape config Closes #41796 See merge request gitlab-org/gitlab-ce!16306
\| * \| \| \| \|	Update prometheus.yml to reflect current Omnibus version41796-update-auto-deployed-prometheus-scrape-config	Joshua Lambert	2018-01-15	1	-119/+81
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '41666-cannot-search-with-keyword-merge' into 'master'	Rémy Coutable	2018-01-16	8	-23/+53
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Cannot search with keyword "merge"" Closes #41666 See merge request gitlab-org/gitlab-ce!16462
\| * \| \| \| \| \|	Only highlight search results under the highlighting size limit41666-cannot-search-with-keyword-merge	Sean McGivern	2018-01-16	3	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should use this limit everywhere, but especially in project search results, where we could be highlighting very long single lines. (Typical examples: minified JavaScript, and JSON data files.)
\| * \| \| \| \| \|	Fix project search results for digits surrounded by colons	Sean McGivern	2018-01-16	5	-23/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A file containing /:\d+:/ in its contents would break the search results if those contents were part of the results, because we were splitting on colons, which can't work with untrusted input. Changing to use the null byte as a separator is much safer.
* \| \| \| \| \| \|	Merge branch '41921-follow-up-fixes' into 'master'	Rémy Coutable	2018-01-16	1	-18/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor of buttons _dropdown partial Closes #41921 See merge request gitlab-org/gitlab-ce!16486
\| * \| \| \| \| \| \|	Refactor of buttons _dropdown partial	Mark Fletcher	2018-01-16	1	-18/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove block + interpolation to simplify the calls to link helpers
* \| \| \| \| \| \| \|	Merge branch 'master' into 'master'docs-comm-article-phoenix-app-gitlab-ci	Rémy Coutable	2018-01-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in doc_styleguide.md See merge request gitlab-org/gitlab-ce!16481
\| * \| \| \| \| \| \| \|	Fix typo in doc_styleguide.md	Mica	2018-01-15	1	-1/+1
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/profile-gpg-keys-column-width' into 'master'	Rémy Coutable	2018-01-16	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change user settings column width See merge request gitlab-org/gitlab-ce!16479
\| * \| \| \| \| \| \| \|	Change user settings column width	George Tsiolis	2018-01-16	1	-2/+2
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/activity-nav-inconsistent-capitalization' into 'master'	Rémy Coutable	2018-01-16	2	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix top-area inconsistent capitalization See merge request gitlab-org/gitlab-ce!16476
\| * \| \| \| \| \| \| \|	Fix top-area inconsistent capitalization	George Tsiolis	2018-01-16	2	-4/+4
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch '41476-enable-project-milestons-deletion-via-api' into 'master'	Rémy Coutable	2018-01-16	4	-0/+67
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Enable Project Milestone Deletion via the API" Closes #41476 See merge request gitlab-org/gitlab-ce!16478
\| * \| \| \| \| \| \| \|	Enables Project Milestone Deletion via API	Jacopo	2018-01-16	4	-0/+67
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables project milestone deletion via DELETE /projects/:id/milestones/:milestone_id
* \| \| \| \| \| \| \|	Merge branch 'issue_41460' into 'master'	Sean McGivern	2018-01-16	4	-23/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error on changes tab when merge request cannot be created Closes #41460 See merge request gitlab-org/gitlab-ce!16409
\| * \| \| \| \| \| \| \|	Fix error on changes tab when merge request cannot be createdissue_41460	Felipe Artur	2018-01-15	4	-23/+36
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'dispatcher-milestones' into 'master'	Filipa Lacerda	2018-01-16	6	-7/+37
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added imports for milestone dispatcher routes See merge request gitlab-org/gitlab-ce!16387
\| * \| \| \| \| \| \| \| \|	fixed eslintdispatcher-milestones	Phil Hughes	2018-01-15	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	correctly init GFM	Phil Hughes	2018-01-15	3	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Added imports for milestone dispatcher routes	Phil Hughes	2018-01-15	6	-6/+37
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-01-16	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42074-rspec-spec-lib-gitlab-background_migration-deserialize_merge_request_diffs_and_commits_spec-rb-spec-services-system_note_service_spec-rb-fails' into 'master' Resolve "rspec spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb spec/services/system_note_service_spec.rb fails" Closes #42074 See merge request gitlab-org/gitlab-ce!16487
\| * \| \| \| \| \| \| \| \| \|	Prevent background migration spec from polluting later models	Sean McGivern	2018-01-16	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the schema changes after 20171114162227 for any of these models, and specs after this one use factories, then those factories will use the models with outdated column information cached. We shouldn't really use factories in migration specs, but this is a special case because there is a lot of git-related setup code in the model that would be painful to copy to the migration. Instead, we just manually reset the column information for the models we could pollute.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mr-status-box-update' into 'master'	Filipa Lacerda	2018-01-16	5	-13/+61
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed merge request status badge not updating after merging See merge request gitlab-org/gitlab-ce!16470
\| * \| \| \| \| \| \| \| \| \| \|	fixed merge request specs	Phil Hughes	2018-01-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|