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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix specsce#31853-projects-shared-groups	Annabel Dunstone Gray	2017-06-08	1	-2/+2
\|
*	fixes project_group_links spec by adding click tab event	tauriedavis	2017-06-08	5	-7/+12
\|
*	31853 Remove duplication for sharing projects with groups in project settings	tauriedavis	2017-06-08	7	-78/+93
\|
*	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
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	update rouge to 2.1.0	http://jneen.net/	2017-06-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'gl-dev/master'	Regis	2017-06-07	3	-8/+48
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.0.10	Regis	2017-06-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.2.5	Regis	2017-06-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.1.7	Regis	2017-06-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.1.6	Regis	2017-06-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.0.9	Regis	2017-06-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.2.4	Regis	2017-06-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'gitlab-ce/master'	Grzegorz Bizon	2017-06-01	703	-4619/+13091
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* ce/master: (349 commits) Revert "Update GITLAB_SHELL_VERSION" Update GITLAB_SHELL_VERSION Add feature toggles through Flipper Add GitLab Resources to University Add Documentation for GIT_CHECKOUT variable Remove entry variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Introduce source to pipeline entity Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions ...
\| * \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.0.8	Regis	2017-05-31	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.1.5	Regis	2017-05-31	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.2.3	Regis	2017-05-31	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.2.2	Regis	2017-05-25	3	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'revert-0a6ee7ce' into 'master'	Clement Ho	2017-05-25	3	-45/+2
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '32908-edit-comment' into 'master'" See merge request !2106
\| \| * \| \| \| \| \| \| \| \| \|	Revert "Merge branch '32908-edit-comment' into 'master'"	Clement Ho	2017-05-25	3	-45/+2
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !2105
\| * \| \| \| \| \| \| \| \| \|	Merge branch '32908-edit-comment' into 'master'	Clement Ho	2017-05-25	3	-2/+45
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escapes html content before appending it to the DOM See merge request !2105
\| \| * \| \| \| \| \| \| \| \| \|	Escapes html content before appending it to the DOM	Filipa Lacerda	2017-05-25	3	-2/+45
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'responsive-table-fixes' into 'master'	Clement Ho	2017-06-08	10	-41/+55
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Responsive table fixes Closes #33376 See merge request !11987
\| * \| \| \| \| \| \| \| \| \| \|	Responsive table fixes	Annabel Dunstone Gray	2017-06-08	10	-41/+55
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '33377-fix-null-ref-in-repo-is-ancestor' into 'master'	Douwe Maan	2017-06-08	2	-8/+34
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nil-check Repository::is_ancestor? Closes #33377 See merge request !11976
\| * \| \| \| \| \| \| \| \| \| \|	nil-check Repository::is_ancestor?	Kim Carlbäcker	2017-06-08	2	-8/+34
\|/ / / / / / / / / / /