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

	Commit message (Collapse)	Author	Age	Files	Lines
*	use destructuring syntax insteadui_pipelines_mini_graph	Regis	2017-01-18	1	-1/+1
\|
*	Merge branch 'master' into ui_pipelines_mini_graph	Regis	2017-01-18	52	-50/+1494
\|\
\| *	Merge branch 'backport-time-tracking-ce' into 'master'	Douwe Maan	2017-01-18	52	-50/+1494
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Backport timetracking to CE See merge request !8195
\| \| *	Fix scss variable refs.backport-time-tracking-ce	Bryce Johnson	2017-01-15	2	-3/+4
\| \| \|
\| \| *	Fix haml-lint complain.	Ruben Davila	2017-01-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	app/views/shared/issuable/_sidebar.html.haml:79 [W] SpaceInsideHashAttributes: Hash attribute should end with one space before the closing brace
\| \| *	Slight modification to the doc	Regis Freyd	2017-01-15	1	-5/+2
\| \| \|
\| \| *	Bring changes that were present only in EE.	Ruben Davila	2017-01-15	1	-14/+12
\| \| \|
\| \| *	Prevent including Vue twice	Alfredo Sumaran	2017-01-15	1	-3/+0
\| \| \|
\| \| *	Backport backend work for time tracking.	Ruben Davila	2017-01-15	30	-17/+692
\| \| \|
\| \| *	Backport timetracking frontend to CE.	Bryce Johnson	2017-01-15	22	-16/+792
\| \| \|
* \| \|	Merge branch 'master' into ui_pipelines_mini_graph	Regis	2017-01-18	8	-5/+51
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'patch-12' into 'master'	Sean McGivern	2017-01-18	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing typo See merge request !8621
\| \| * \|	Fixing typo	Cristian Thiago Moecke	2017-01-18	1	-1/+1
\| \|/ /
\| * \|	Merge branch 'i-#25814-500-error' into 'master'	Sean McGivern	2017-01-18	3	-1/+44
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Compare page throws 500 error when any branch/reference is not selected Closes #25814 See merge request !8523
\| \| * \|	refactor rubocop suggestion	Martin Cabrera	2017-01-16	1	-1/+1
\| \| \| \|
\| \| * \|	Merge branch 'master' into i-#25814-500-error	Martin Cabrera	2017-01-16	57	-457/+615
\| \| \|\ \
\| \| * \| \|	Refactored ‘from’ and ‘to’ variable preservation	Martin Cabrera	2017-01-16	1	-10/+6
\| \| \| \| \|
\| \| * \| \|	Added specs for the preservation of the from/to parameter	Martin Cabrera	2017-01-15	1	-1/+21
\| \| \| \| \|
\| \| * \| \|	from or to get variables gets preserved if the other one is missing	Martin Cabrera	2017-01-15	1	-2/+9
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' into i-#25814-500-error	Martin Cabrera	2017-01-15	74	-2147/+2400
\| \| \|\ \ \
\| \| * \| \| \|	Changed alert message character: from & to and	Martin Cabrera	2017-01-15	1	-1/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into i-#25814-500-error	Martin Cabrera	2017-01-12	92	-522/+5054
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'master' into i-#25814-500-error	Martin Cabrera	2017-01-11	58	-496/+577
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Added specs for branches compare when from & to are empty	Martin Cabrera	2017-01-10	1	-0/+10
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix Compare page throws 500 error when any branch/reference is not selected	Martin Cabrera	2017-01-10	2	-1/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'clipboard-button-commit-sha' into 'master'	Sean McGivern	2017-01-18	4	-3/+6
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy commit SHA to clipboard See merge request !8547
\| \| * \| \| \| \| \| \|	Update clipboard_button text: Copy commit SHA to clipboardclipboard-button-commit-sha	victorwu	2017-01-17	4	-3/+6
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	get rid of log	Regis	2017-01-17	1	-2/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	fix UI behaviour - only make new calls when button is clicked and dropdown ↵	Regis	2017-01-17	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is not displayed
* \| \| \| \| \| \| \|	Merge branch 'master' into ui_pipelines_mini_graph	Regis	2017-01-17	57	-121/+779
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch '26756-fix-already-intialized-constant-warnings' into 'master'	Robert Speicher	2017-01-17	3	-7/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some useless require_relative statements Closes #26756 See merge request !8609
\| \| * \| \| \| \| \| \|	Remove some useless require_relative statements26756-fix-already-intialized-constant-warnings	Rémy Coutable	2017-01-17	3	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Merge branch 'mr-tabs-alignment-sidebar-open' into 'master'	Annabel Dunstone Gray	2017-01-17	2	-1/+9
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly keeps merge request tabs in place when editting value in See merge request !8595
\| \| * \| \| \| \| \| \| \|	Correctly keeps merge request tabs in place when editting value inmr-tabs-alignment-sidebar-open	Phil Hughes	2017-01-16	2	-1/+9
\| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	collapsed sidebar Previously the CSS would presume the sidebar is open, which it is but as an overlay so the CSS was pushing the tabs when it shouldnt of been
\| * \| \| \| \| \| \| \|	Merge branch 'rubocop-todo' into 'master'	Grzegorz Bizon	2017-01-17	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable all cops in .rubocop_todo.yml See merge request !8610
\| \| * \| \| \| \| \| \| \|	Disable all cops in .rubocop_todo.ymlrubocop-todo	Sean McGivern	2017-01-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cops with a max level are auto-generated with that set to the current maximum, even when they're supposed to be ignored. For now, the best option is to manually disable them.
\| * \| \| \| \| \| \| \| \|	Merge branch '24915_merge_slash_command' into 'master'	Sean McGivern	2017-01-17	22	-8/+540
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support `/merge` slash command for MRs Closes #24915 See merge request !7746
\| \| * \| \| \| \| \| \| \| \|	Address MR comments	Jarka Kadlecova	2017-01-13	11	-26/+60
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	refresh merge widget after using /merge command	Jarka Kadlecova	2017-01-11	5	-0/+77
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	support `/merge` slash comand for MRs	Jarka Kadlecova	2017-01-11	15	-8/+429
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'reduce-queries-milestone-index' into 'master'	Sean McGivern	2017-01-17	3	-3/+10
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use cached values to compute total issues count in milestone index pages See merge request !8518
\| \| * \| \| \| \| \| \| \| \| \|	Use cached values to compute total issues count in milestone index pagesreduce-queries-milestone-index	Adam Niedzielski	2017-01-10	3	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestoneish#issues_visible_to_user caches only the ActiveRecord relation, not the actual result. Introduce Milestoneish#total_issues_count that relies on the cached method Milestoneish#count_issues_by_state to reduce the number of queries.
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/keep-artifacts-button-visibility' into 'master'	Sean McGivern	2017-01-17	5	-9/+49
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show artifacts keep button if not allowed Closes #26357 See merge request !8501
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility	Grzegorz Bizon	2017-01-16	343	-3496/+11342
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (579 commits) Conflicts: spec/models/build_spec.rb
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add method that checks for expiring build artifacts	Grzegorz Bizon	2017-01-09	4	-17/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add changelog for artifacts button visibility fix	Grzegorz Bizon	2017-01-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Do not show artifacts keep button if not allowed	Grzegorz Bizon	2017-01-09	2	-8/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue_25017' into 'master'	Sean McGivern	2017-01-17	7	-21/+63
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show 'too many changes' message for merge request Closes #25017 See merge request !8444
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Show 'too many changes' message for merge requestissue_25017	Felipe Artur	2017-01-12	8	-22/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'pmq20/gitlab-ce-psvr/persisted' into 'master'	Robert Speicher	2017-01-17	2	-1/+9
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mark Commits as persisted See merge request !8604