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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Version 8.7.0-rc4v8.7.0-rc4	Yorick Peterse	2016-04-08	1	-1/+1
\|
*	Merge branch 'master' into 8-7-stable	Yorick Peterse	2016-04-08	3	-0/+111
\|\
\| *	Merge branch 'instrument-rails-cache' into 'master'	Yorick Peterse	2016-04-08	3	-0/+111
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Instrument Rails cache code See merge request !3619
\| \| *	Instrument Rails cache codeinstrument-rails-cache	Yorick Peterse	2016-04-08	3	-0/+111
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to track how much time of a transaction is spent in dealing with cached data.
* \| \|	Merge branch 'master' into 8-7-stable	Yorick Peterse	2016-04-08	18	-38/+215
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'update-gitlab-shell' into 'master'	Yorick Peterse	2016-04-08	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-shell to 2.7.2 See merge request !3594
\| \| * \|	Update gitlab-shell to 2.7.2	Yorick Peterse	2016-04-07	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch '15078-todo-row' into 'master'	Jacob Schatz	2016-04-08	1	-2/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use meta key to open todo in new tab Fixes #15078 See merge request !3623
\| \| * \| \|	Use meta key to open todo in new tab15078-todo-row	Annabel Dunstone	2016-04-08	1	-2/+7
\| \| \| \| \|
\| * \| \| \|	Merge branch 'remove-todo' into 'master'	Dmitriy Zaporozhets	2016-04-08	1	-4/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove TODO for not documented stuff We should not put a `TODO` in a released product. See merge request !3553
\| \| * \| \| \|	Remove TODO for not documented stuff	Robert Schilling	2016-04-05	1	-4/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'rs-testing-guide' into 'master'	Dmitriy Zaporozhets	2016-04-08	3	-1/+136
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First pass at a Testing styleguide Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14121 [ci skip] See merge request !3465
\| \| * \| \| \| \|	Add a link back to Development documentation to Testing guiders-testing-guide	Robert Speicher	2016-04-01	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \|	Add a section about `let` to the Testing guide	Robert Speicher	2016-04-01	1	-4/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \|	Factories don't have to be limited to `ActiveRecord` objects	Robert Speicher	2016-04-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \|	Add a note about Four-Phase Test to Testing guide	Robert Speicher	2016-04-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \|	First pass at a Testing styleguide	Robert Speicher	2016-04-01	3	-1/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Merge branch 'metrics-timestamp-precision' into 'master'	Yorick Peterse	2016-04-08	1	-1/+21
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use more accurate timestamps for InfluxDB. See merge request !3617
\| \| * \| \| \| \|	Use more accurate timestamps for InfluxDB.metrics-timestamp-precision	Yorick Peterse	2016-04-08	1	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes the timestamp of metrics to be more accurate/unique by using Time#to_f combined with a small random jitter value. This combination hopefully reduces the amount of collisions, though there's no way to fully prevent any from occurring. Fixes gitlab-com/operations#175
\| * \| \| \| \| \|	Merge branch 'gitlab-workhorse-0.7.2' into 'master'	Yorick Peterse	2016-04-08	3	-3/+3
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 0.7.2 See merge request !3570
\| \| * \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Jacob Vosmaer	2016-04-07	73	-310/+1052
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-workhorse-0.7.2
\| \| * \| \| \| \| \|	Use gitlab-workhorse 0.7.2	Jacob Vosmaer	2016-04-06	3	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'api-expose-subscribed' into 'master'	Rémy Coutable	2016-04-08	7	-25/+46
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose subscribed? on issues and merge requests This is the first start for the new `subscribable` API. It exposes the `subscribed` field for issues and merge requests. Related to #6024 See merge request !3611
\| \| * \| \| \| \| \|	API: Expose subscribed? on issues	Robert Schilling	2016-04-08	7	-25/+46
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Robert Schilling	2016-04-08	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Incorrect Quote In Docker Executor Example ## What does this MR do? The corrected line opened with a regular quote (') but closed with a back-tick (`) I believe this is invalid bash syntax ## Are there points in the code the reviewer needs to double check? Probably not ## Why was this MR needed? Fixes error when example is copied and pasted ## What are the relevant issue numbers? None ## Screenshots (if relevant) None See merge request !3604
\| \| * \| \| \| \| \| \|	Fix Incorrect Quote In Docker Executor Example	Alex Mayer	2016-04-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'revert-missing-changelog' into 'master'	Jacob Schatz	2016-04-07	1	-1/+0
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove changelog entry for new navigation sidebar. See merge request !3608
\| \| * \| \| \| \| \| \| \|	Remove changelog entry for new navigation sidebar.	Jacob Schatz	2016-04-07	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'code-wrapping' into 'master'	Jacob Schatz	2016-04-07	2	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix side-by-side code format & commit message wrap ![Screen_Shot_2016-04-07_at_1.31.28_PM](/uploads/bad00284e4dfbec1fdd75220c34f4a98/Screen_Shot_2016-04-07_at_1.31.28_PM.png) ![Screen_Shot_2016-04-07_at_1.32.23_PM](/uploads/7cd344765025e93d0035934a473b4bb3/Screen_Shot_2016-04-07_at_1.32.23_PM.png) See merge request !3605
\| \| * \| \| \| \| \| \| \| \|	Fix side-by-side code format & commit message wrapcode-wrapping	Annabel Dunstone	2016-04-07	2	-0/+6
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'revert-2ed6cd9e' into 'master'	Jacob Schatz	2016-04-07	19	-109/+130
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'new-navigation-prototype' into 'master'" This reverts merge request !3494 See merge request !3607
\| \| * \| \| \| \| \| \| \| \|	Revert "Merge branch 'new-navigation-prototype' into 'master'"	Jacob Schatz	2016-04-07	19	-109/+130
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !3494
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.6.5, 8.5.10, 8.4.8, and 8.3.7	Robert Speicher	2016-04-07	1	-3/+17
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Merge branch 'revert-5e8740ee' into 'master'	Jacob Schatz	2016-04-07	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix-sidebar-exapnd' into 'master'" This reverts merge request !3520 See merge request !3606
\| \| * \| \| \| \| \| \|	Revert "Merge branch 'fix-sidebar-exapnd' into 'master'"revert-5e8740ee	Jacob Schatz	2016-04-07	1	-1/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !3520
\| * \| \| \| \| \| \|	Merge branch 'indentation-bug' into 'master'	Jacob Schatz	2016-04-07	1	-3/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preserve white space See merge request !3602
\| \| * \| \| \| \| \| \|	Indentation updateindentation-bug	Annabel Dunstone	2016-04-07	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Preserve white space	Annabel Dunstone	2016-04-07	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master'	Jacob Schatz	2016-04-07	3	-1/+4
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update number of Todos in the sidebar when it's marked as "Done" Closes #15002 See merge request !3600
\| \| * \| \| \| \| \| \| \|	Update CHANGELOGfix-number-of-todos-sidebar-is-not-updated	Douglas Barbosa Alexandre	2016-04-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Update number of Todos in the sidebar when it's marked as "Done"	Douglas Barbosa Alexandre	2016-04-07	2	-1/+3
\| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'issue_14012' into 'master'	Rémy Coutable	2016-04-07	5	-6/+42
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix problem when creating milestones in groups without projects Fixes #14012 See merge request !3481
\| \| * \| \| \| \| \| \|	Implement review suggestions	Felipe Artur	2016-04-07	4	-7/+6
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Improve code	Felipe Artur	2016-04-05	3	-17/+22
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Improve code	Felipe Artur	2016-04-05	1	-7/+15
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix problem when creating milestones in groups without projects	Felipe Artur	2016-04-05	2	-5/+29
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'regex-for-colons' into 'master'	Douwe Maan	2016-04-07	4	-2/+118
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add optional colon. See merge request !3591
\| \| * \| \| \| \| \| \| \|	CHANGELOG	Jacob Schatz	2016-04-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove dumb debug statement and add many tests.	Jacob Schatz	2016-04-07	3	-2/+116
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add optional colon.	Jacob Schatz	2016-04-07	1	-1/+2
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|