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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Instrument all service classesinstrument-service-classes	Yorick Peterse	2016-04-12	1	-0/+12
\| \| \| \|	Fixes gitlab-org/gitlab-ce#15162
*	Merge branch 'api-labels-info' into 'master'	Rémy Coutable	2016-04-12	3	-20/+22
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose open_issues_count, closed_issues_count, open_merge_requests_count on labels Partly fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13238 See merge request !3569
\| *	Add changelog item	Robert Schilling	2016-04-06	1	-0/+1
\| \|
\| *	API: Expose open_issues_count, closed_issues_count, ↵	Robert Schilling	2016-04-06	2	-20/+21
\| \| \| \| \| \| \| \|	open_merge_requests_count on labels
* \|	Merge branch 'issue_1752' into 'master'	Robert Speicher	2016-04-11	2	-4/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestone removal problem when editing issues fixes #1752 See merge request !3571
\| * \|	improve specs code syntaxissue_1752	Felipe Artur	2016-04-07	1	-11/+11
\| \| \|
\| * \|	Fix milestone removal problem when editing issues	Felipe Artur	2016-04-06	2	-0/+16
\| \| \|
* \| \|	Merge branch 'banzai-metrics' into 'master'	Robert Speicher	2016-04-11	2	-8/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument Banzai code See merge request !3659
\| * \| \|	Instrument Banzai code	Yorick Peterse	2016-04-11	2	-8/+35
\| \| \| \|
* \| \| \|	Merge branch 'fix-revert-scroll' into 'master'	Jacob Schatz	2016-04-11	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix scroll bars shown in Revert dialogue box ## What does this MR do? Eliminate scroll bars shown in Revert dialogue box, see the screenshots. ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? Ugly scroll bars are shown in Revert dialogue box. ## What are the relevant issue numbers? N/A ## Screenshots ![Screen_Shot_2016-04-05_at_15.27.10](/uploads/428295858ada7cd2fcdf1e831c42f8ec/Screen_Shot_2016-04-05_at_15.27.10.png) See merge request !3532
\| * \| \| \|	Eliminate ugly scroll bars shown in modal boxes	P.S.V.R	2016-04-05	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'workhorse-0.7.1' into 'master'	Yorick Peterse	2016-04-11	3	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Go back to gitlab-workhorse 0.7.1 See merge request !3656
\| * \| \| \| \|	Go back to gitlab-workhorse 0.7.1	Jacob Vosmaer	2016-04-11	3	-3/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We found out that 0.7.2 breaks shallow `git clone`. GitLab 8.7 will work fine with gitlab-workhorse 0.7.1 too.
* \| \| \| \|	Merge branch 'dashboard-filter-milestone' into 'master'	Jacob Schatz	2016-04-11	2	-1/+61
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with dashboard/issues not filtering by milestone Closes #15128 See merge request !3650
\| * \| \| \| \|	Fixed issue with dashboard/issues not filtering by milestonedashboard-filter-milestone	Phil Hughes	2016-04-11	2	-1/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15128
* \| \| \| \| \|	Merge branch 'complexity/descrease-abc-size-threshold' into 'master'	Dmitriy Zaporozhets	2016-04-11	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease threshold for ABC Size metric in Rubocop To 55. References #3444 See merge request !3598
\| * \| \| \| \|	Decrease threshold for ABC Size metric in Rubocopcomplexity/descrease-abc-size-threshold	Grzegorz Bizon	2016-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To 60.
* \| \| \| \| \|	Merge branch 'metrics-measure-block-transaction' into 'master'	Yorick Peterse	2016-04-11	5	-40/+67
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store block timings as transaction values See merge request !3649
\| * \| \| \| \| \|	Fixed stubbing for Gitlab::Metrics specs	Yorick Peterse	2016-04-11	2	-5/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the measure method uses Transaction.current directly the SQL subscriber (Subscribers::ActiveRecord) will add timings of queries triggered by DB cleaner.
\| * \| \| \| \| \|	Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transaction	Yorick Peterse	2016-04-11	3	-3/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added specs for Gitlab::Metrics::System.cpu_time	Yorick Peterse	2016-04-11	1	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Store block timings as transaction values	Yorick Peterse	2016-04-11	4	-39/+47
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier to query, simplifies the code, and makes it possible to figure out what transaction the data belongs to (simply because it's now stored _in_ the transaction). This new setup keeps track of both the real/wall time _and_ CPU time spent in a block, both measured using milliseconds (to keep all units the same).
* \| \| \| \| \|	Merge branch 'rs-form_errors' into 'master'	Dmitriy Zaporozhets	2016-04-11	33	-153/+105
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Standardize the way we check for and display form errors - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. See merge request !3531
\| * \| \| \| \| \|	Standardize the way we check for and display form errorsrs-form_errors	Robert Speicher	2016-04-04	33	-153/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard.
* \| \| \| \| \| \|	Merge branch 'rs-code-review-guide' into 'master'	Dmitriy Zaporozhets	2016-04-11	2	-0/+80
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First pass at a Code Review guide Largely borrowed from thoughtbot's code review guide, so attribution is included. [ci skip] See merge request !3639
\| * \| \| \| \| \| \|	Re-add a note about sarcasm to the Code Review guiders-code-review-guide	Robert Speicher	2016-04-10	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	First pass at a Code Review guide	Robert Speicher	2016-04-09	2	-0/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Largely borrowed from thoughtbot's code review guide, so attribution is included. [ci skip]
* \| \| \| \| \| \| \|	Merge branch 'mr-ui-update' into 'master'	Jacob Schatz	2016-04-11	22	-115/+297
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated UI for new merge request Closes #2540 ![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png) ![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png) See merge request !3228
\| * \| \| \| \| \| \| \|	Merge request mobile spacingmr-ui-update	Phil Hughes	2016-04-11	1	-2/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed dropdown title overlap	Phil Hughes	2016-04-11	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Addressed feedback	Phil Hughes	2016-04-11	5	-16/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed important from css
\| * \| \| \| \| \| \| \|	Fixed tests	Phil Hughes	2016-04-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Build fix	Phil Hughes	2016-04-06	2	-3/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed builds	Phil Hughes	2016-04-06	7	-23/+30
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed spacing in MR footer	Phil Hughes	2016-04-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Removed un-used get request	Phil Hughes	2016-04-06	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed target project update	Phil Hughes	2016-04-06	6	-38/+42
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Filters by text on element	Phil Hughes	2016-04-06	2	-7/+31
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Checkmarks in dropdowns for already selected values	Phil Hughes	2016-04-06	2	-7/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use new dropdowns for MR compare	Phil Hughes	2016-04-06	5	-32/+82
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed failing tests	Phil Hughes	2016-04-06	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Updated UI for new merge request	Phil Hughes	2016-04-06	10	-61/+138
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2540
* \| \| \| \| \| \| \|	Merge branch 'rs-remove-markdown-tips' into 'master'	Dmitriy Zaporozhets	2016-04-11	2	-30/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `random_markdown_tip` helper Only usage got removed in !3442 See merge request !3637
\| * \| \| \| \| \| \|	Remove `random_markdown_tip` helperrs-remove-markdown-tips	Robert Speicher	2016-04-09	2	-30/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only usage got removed in !3442
* \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2016-04-11	1	-7/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct documentation on enabling artifacts. The docs say to enable artifacts that settings should be set to "false". This updates the documents to change the setting to "true". See merge request !3630
\| * \| \| \| \| \| \| \|	fix typo	Benjamin Montgomery	2016-04-10	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make the purpose of artifact config options clearer	Benjamin Montgomery	2016-04-10	1	-9/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	actually enable artifacts	Benjamin Montgomery	2016-04-09	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'add-missing-mixin' into 'master'	Stan Hu	2016-04-11	1	-4/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use false/true mixin in migration from !3640 See merge request !3646
\| * \| \| \| \| \| \| \| \|	Use false/true mixin in migration from !3640	Stan Hu	2016-04-10	1	-4/+6
\|/ / / / / / / / /