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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Improve TeamcityService and its specsfix-trailing-slash-in-teamcity_url-3515	Rémy Coutable	2016-04-13	3	-58/+203
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Fix a bug with trailing slash in teamcity_url	Charles May	2016-04-12	2	-13/+21
\| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/3515
*	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
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-raw-sql-migrations' into 'master'	Stan Hu	2016-04-11	4	-12/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix more SQL migrations to use raw commands gitlab-org/gitlab-development-kit#109 See merge request !3640
\| * \| \| \| \| \| \|	Fix more SQL migrations to use raw commands	Stan Hu	2016-04-10	4	-12/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-org/gitlab-development-kit#109
* \| \| \| \| \| \| \|	Merge branch 'upgrade-annotate' into 'master'	Robert Speicher	2016-04-11	2	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade annotate from 2.6.10 to 2.7.0 We don’t have any tests for this, so no need to run them. [ci skip] Includes compatibility with Rails 5. Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286. See merge request !3645
\| * \| \| \| \| \| \| \|	Upgrade annotate from 2.6.10 to 2.7.0	connorshea	2016-04-10	2	-4/+4
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes compatibility with Rails 5. We don’t have any tests for this, so no need to run them. [ci skip] Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286.
* \| \| \| \| \| \| \|	Merge branch 'upgrade-premailer-rails' into 'master'	Robert Speicher	2016-04-11	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade premailer-rails from 1.9.0 to 1.9.2 Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v192 Working towards #14286. See merge request !3643
\| * \| \| \| \| \| \| \|	Upgrade premailer-rails from 1.9.0 to 1.9.2	connorshea	2016-04-10	1	-3/+3
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19 2 Working towards #14286.
* \| \| \| \| \| \| \|	Merge branch 'fix-milestone-seedfu' into 'master'	Robert Speicher	2016-04-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix seed_fu failure with inserting milestones into test DB Milestones were not being saved due to "invalid state" validation errors See merge request !3641
\| * \| \| \| \| \| \| \|	Fix seed_fu failure with inserting milestones into test DB	Stan Hu	2016-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestones were not being saved due to "invalid state" validation errors
* \| \| \| \| \| \| \| \|	Merge branch 'issue_14353' into 'master'	Jacob Schatz	2016-04-11	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore toggling the sidebar for resolutions over 1200px width Closes #14353 ![sidebar1](/uploads/4b8d0eaa1b320c319239cb572932f740/sidebar1.gif) See merge request !3547
\| * \| \| \| \| \| \| \| \|	Use existence operator insteadissue_14353	Alfredo Sumaran	2016-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Check existence of variable method	Alfredo Sumaran	2016-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.