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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fall back to gzip when zopfli compression is unavailablefall-back-to-gzip-when-missing-optional-deps	Mike Greiling	2017-06-09	1	-1/+10
\|
*	Merge branch 'dm-diff-file-diffable' into 'master'	Sean McGivern	2017-06-08	8	-66/+43
\|\ \| \| \| \| \| \| \| \|	Move diffable? method from Repository to Diff::File See merge request !11980
\| *	Move diffable? method from Repository to Diff::Filedm-diff-file-diffable	Douwe Maan	2017-06-08	8	-79/+68
\| \|
* \|	Merge branch 'dm-highlight-diff-file-blob' into 'master'	Sean McGivern	2017-06-08	5	-54/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use Diff::File blob methods from diff highlighter See merge request !11978
\| * \|	Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blob	Douwe Maan	2017-06-08	5	-54/+54
\| \| \|
* \| \|	Merge branch 'docs/shared-runners' into 'master'	Sean Packham	2017-06-08	4	-78/+136
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Runners docs Closes #18882 See merge request !11948
\| * \| \|	Refactor Runners docsdocs/shared-runners	Achilleas Pipinellis	2017-06-07	4	-78/+136
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Update overall documentation - Update images - Add information about fair usage
* \| \| \|	Merge branch 'docs/rm-protected-branches' into 'master'	Sean Packham	2017-06-08	2	-0/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for protected branches deletion feature Closes #32218 See merge request !11536
\| * \| \| \|	Add docs for protected branches deletion featuredocs/rm-protected-branches	Achilleas Pipinellis	2017-05-19	2	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/32218
* \| \| \| \|	Merge branch 'docs/triggers' into 'master'	Sean Packham	2017-06-08	3	-84/+77
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor CI triggers docs See merge request !12012
\| * \| \| \| \|	Refactor CI triggers docsdocs/triggers	Achilleas Pipinellis	2017-06-08	3	-84/+77
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '33383_add_bulgarian_translation_of_cycle_analytics_page' into ↵	Douwe Maan	2017-06-08	5	-1/+267
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add bulgarian translation of Cycle Analytics Page to I18N Closes #33383 See merge request !11958
\| * \| \| \| \| \|	added changelog for Bulgarian translations	黄涛	2017-06-07	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add bulgarian translation of cycle analytics page to I18N	黄涛	2017-06-07	4	-1/+263
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #33383
* \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-06-08	5	-0/+266
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33334_add_portuguese_brazil_translation_of_cycle_analytics_page' into 'master' Add portuguese brazil translation of Cycle Analytics Page to I18N Closes #33334 See merge request !11920
\| * \| \| \| \| \|	Merge branch ↵	黄涛	2017-06-07	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33334_add_portuguese_brazil_translation_of_cycle_analytics_page' of gitlab.com:htve/gitlab-ce into 33334_add_portuguese_brazil_translation_of_cycle_analytics_page
\| \| * \| \| \| \| \|	Update i18n.rb style	Huang Tao	2017-06-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	added changelog for Portuguese Brazil translations	黄涛	2017-06-06	1	-0/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	add portuguese brazil translation of cycle analytics page	黄涛	2017-06-06	4	-0/+262
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #33334
\| * \| \| \| \| \| \|	Update i18n.rb style	Huang Tao	2017-06-07	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	added changelog for Portuguese Brazil translations	黄涛	2017-06-07	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add portuguese brazil translation of cycle analytics page	黄涛	2017-06-07	4	-0/+262
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #33334
* \| \| \| \| \| \|	Merge branch 'allow-reporters-to-promote-group-labels' into 'master'	Douwe Maan	2017-06-08	4	-7/+11
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow group reporters to promote labels See merge request !12006
\| * \| \| \| \| \|	Allow group reporters to promote labelsallow-reporters-to-promote-group-labels	Sean McGivern	2017-06-08	4	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They can admin group labels anyway, we weren't checking the more specific permission.
* \| \| \| \| \| \|	Merge branch '32720-emoji-spacing' into 'master'	Annabel Dunstone Gray	2017-06-08	4	-10/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	32720 Create equal spacing between emoji buttons and remove unnecessary margin-bottom Closes #32720 See merge request !11889
\| * \| \| \| \| \| \|	remove extra space on thumbs emoji buttons32720-emoji-spacing	tauriedavis	2017-06-07	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	32720 Create equal padding for emoji on comments and emoji-block	tauriedavis	2017-06-06	4	-10/+18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-document-road-to-graphql' into 'master'	Douwe Maan	2017-06-08	1	-0/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add text documenting that v5 of the API will be GraphQL See merge request !11998
\| * \| \| \| \| \| \| \|	Add text documenting that v5 of the API will be GraphQLsh-document-road-to-graphql	Stan Hu	2017-06-07	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'zj-i18n-pipeline-schedules' into 'master'	Douwe Maan	2017-06-08	22	-160/+2423
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow translation of Pipeline Schedules See merge request !11974
\| * \| \| \| \| \| \| \| \|	Regenerate po and js fileszj-i18n-pipeline-schedules	Z.J. van de Weg	2017-06-08	13	-8/+3109
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow translation of Pipeline Schedules	Z.J. van de Weg	2017-06-08	22	-2416/+536
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove-transition' into 'master'	Annabel Dunstone Gray	2017-06-08	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary transition Closes #33431 See merge request !11985
\| * \| \| \| \| \| \| \| \| \|	Remove unnecessary transitionremove-transition	Clement Ho	2017-06-07	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '33202-scrollbar-center' into 'master'	Phil Hughes	2017-06-08	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Jobs page scrollbar and centering" Closes #33202 See merge request !12000
\| * \| \| \| \| \| \| \| \| \|	Resolve "Jobs page scrollbar and centering"	Filipa Lacerda	2017-06-08	2	-3/+3
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'blob-load-all-data' into 'master'	Grzegorz Bizon	2017-06-08	10	-13/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Blob#load_all_data! doesn’t need an argument See merge request !11977
\| * \| \| \| \| \| \| \| \| \|	Blob#load_all_data! doesn’t need an argumentblob-load-all-data	Douwe Maan	2017-06-07	10	-13/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'clean-up-project-for-merge-conflicts' into 'master'	Rémy Coutable	2017-06-08	1	-16/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up the Project model to reduce conflicts See merge request !11967
\| * \| \| \| \| \| \| \| \| \|	Split Project#reset_cache_and_import_attrs up	Yorick Peterse	2017-06-08	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In EE we don't want to remove import data for mirrors. By moving this logic to a separate method we can simply re-define the method in EE using "prepend" and call "super" whenever necessary.
\| * \| \| \| \| \| \| \| \| \|	Re-order some methods in Project	Yorick Peterse	2017-06-08	1	-15/+16
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the order of these methods is identical in CE and EE.
* \| \| \| \| \| \| \| \| \|	Merge branch '12614-fix-long-message' into 'master'	Dmitriy Zaporozhets	2017-06-08	3	-18/+39
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix long urls in the title of commit Closes #12614 See merge request !10938
\| * \| \| \| \| \| \| \| \| \|	Fix long urls in the title of commit	Alexander Randa	2017-05-12	3	-18/+39
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-prom-pipeline-count' into 'master'	Grzegorz Bizon	2017-06-08	3	-0/+18
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add prometheus metrics on pipeline creation Closes #32624 See merge request !11975
\| * \| \| \| \| \| \| \| \| \|	Add test for prom metric gatheringzj-prom-pipeline-count	Z.J. van de Weg	2017-06-08	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add prometheus metrics on pipeline creation	Z.J. van de Weg	2017-06-07	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2017-06-08	2	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'28607-forking-and-configuring-project-via-api-works-very-unreliable' into 'master' Confirm Project forking behaviour via the API Closes #28607 See merge request !11931
\| * \| \| \| \| \| \| \| \| \| \|	Confirm Project forking behaviour via the API	Mark Fletcher	2017-06-06	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* It's unclear that the forking operation can still be ongoing * `import_status` is available in Project Entity to determine status
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/rouge-2.1.0' into 'master'	Douwe Maan	2017-06-08	3	-29/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update rouge to 2.1.0 See merge request !11992
\| * \| \| \| \| \| \| \| \| \| \| \|	remove the rouge copypasta and add notes to refactor	http://jneen.net/	2017-06-07	2	-28/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|