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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add support for not Active Record based factories	Grzegorz Bizon	2016-03-30	1	-4/+12
\|
*	Refactor uploads rewriter used when moving issue	Grzegorz Bizon	2016-03-30	5	-39/+27
\|
*	Get FileUploader into test harness using factory	Grzegorz Bizon	2016-03-30	3	-6/+22
\| \| \| \| \| \| \| \|	This attempts to get CarrierWave's uploader - `FileUploader` into test harness using a factory. that makes it easier to build an instance of it. Along with !3435 it may be easier to use uploaders in tests
*	Add uploads rewriter and use it when moving issue	Grzegorz Bizon	2016-03-30	4	-12/+151
\|
*	Add markdown pattern for uploads to file uploader	Grzegorz Bizon	2016-03-30	1	-0/+1
\|
*	Merge branch 'notification-settings-save' into 'master'	Rémy Coutable	2016-03-30	1	-16/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with notification settings not saving Closes #14736 See merge request !3452
\| *	Fixed issue with notification settings not saving	Phil Hughes	2016-03-30	1	-16/+17
\|/ \| \| \|	Closes #14736
*	Merge branch 'rs-banzai-requires' into 'master'	Rémy Coutable	2016-03-30	18	-38/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant `require`s from Banzai files We're trying to avoid circular dependency errors. Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/13521 Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/8/ See merge request !3391
\| *	Remove redundant `require`s from Banzai filesrs-banzai-requires	Robert Speicher	2016-03-24	18	-38/+0
\| \| \| \| \| \| \| \|	We're trying to avoid circular dependency errors.
* \|	Merge branch 'added-milestone-upcoming' into 'master'	Rémy Coutable	2016-03-30	12	-59/+139
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dropdown bug fixes - Added back upcoming to milestone filter ![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png) - Fixed bug that would cause the currently selected value to disappear on filters - Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past Closes #14536 See merge request !3368
\| * \|	Spec updatesadded-milestone-upcoming	Phil Hughes	2016-03-29	2	-8/+6
\| \| \|
\| * \|	Updated based on Ruby feedback	Phil Hughes	2016-03-29	4	-6/+6
\| \| \|
\| * \|	Ruby fixes	Phil Hughes	2016-03-29	2	-12/+5
\| \| \|
\| * \|	Fixed multiselect	Phil Hughes	2016-03-29	2	-28/+6
\| \| \|
\| * \|	Fixed rubocop issues	Phil Hughes	2016-03-29	1	-5/+6
\| \| \|
\| * \|	Fixed issue with milestone not being un-selectable	Phil Hughes	2016-03-29	1	-0/+2
\| \| \|
\| * \|	Standardised the output of the JSON to always include the name	Phil Hughes	2016-03-29	6	-14/+31
\| \| \| \| \| \| \| \| \| \| \| \|	The frontend will then always use the name as the ID - like previous
\| * \|	Removed un-used code	Phil Hughes	2016-03-29	1	-11/+0
\| \| \|
\| * \|	Updated to only include upcoming on filters	Phil Hughes	2016-03-29	2	-3/+24
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes tests
\| * \|	Added tests for upcoming milestone filter	Phil Hughes	2016-03-29	2	-0/+68
\| \| \|
\| * \|	Dropdown bug fixes	Phil Hughes	2016-03-29	6	-23/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added back upcoming to milestone filter Fixed bug that would cause the currently selected value to disappear on filters Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past
* \| \|	Merge branch 'fix-mr-comment-commit-pruned' into 'master'	Robert Speicher	2016-03-29	3	-4/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gracefully handle notes on deleted commits in merge requests Closes #3250 See merge request !3402
\| * \| \|	Gracefully handle notes on deleted commits in merge requests	Stan Hu	2016-03-28	3	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3250
* \| \| \|	Merge branch ↵	Robert Speicher	2016-03-29	5	-44/+83
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master' api - expose label description Resolves #14415 See merge request !3314
\| * \| \| \|	api - expose label description	Mariusz Jachimowicz	2016-03-24	5	-44/+83
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'fix_wip_in_mr_api' into 'master'	Robert Speicher	2016-03-29	3	-5/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensuring Merge Request API returns boolean values for work_in_progress Fixes #14692. See merge request !3432
\| * \| \| \|	Ensuring Merge Request API returns boolean values for work_in_progress	Abhi Rao	2016-03-28	3	-5/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #14692
* \| \| \| \|	Merge branch 'handle-nil-description-slack-message' into 'master'	Robert Speicher	2016-03-29	3	-1/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle nil descriptions in Slack issue messages Closes #14676 See merge request !3420
\| * \| \| \| \|	Handle nil descriptions in Slack issue messages	Stan Hu	2016-03-28	3	-1/+12
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14676
* \| \| \| \|	Merge branch 'gitlab-shell-2.7' into 'master'	Robert Speicher	2016-03-29	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated gitlab-shell to 2.7 This is done to include the changes introduced in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42. See merge request !3437
\| * \| \| \| \|	Updated gitlab-shell to 2.7gitlab-shell-2.7	Yorick Peterse	2016-03-29	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is done to include the changes introduced in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.
* \| \| \| \|	Merge branch 'rs-fix-migrations' into 'master'	Dmitriy Zaporozhets	2016-03-29	5	-34/+54
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use raw SQL instead of Rails models in migrations where appropriate Closes #14694. See merge request !3429
\| * \| \| \|	Use raw SQL instead of Rails models in migrations where appropriaters-fix-migrations	Robert Speicher	2016-03-28	5	-34/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14694.
* \| \| \| \|	Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master'	Rémy Coutable	2016-03-29	1	-21/+21
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix order of steps to prevent PostgreSQL errors when running migration Supersedes https://github.com/gitlabhq/gitlabhq/pull/10100. /cc @stanhu @rodrigomanhaes See merge request !3355
\| * \| \| \| \|	Fix order of steps to prevent PostgreSQL errors when running migration [ci skip]doc-update-8.5-to-8.6-fix-steps-order	Rodrigo Manhães	2016-03-22	1	-21/+21
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/nomethod-error-on-ci' into 'master'	Rémy Coutable	2016-03-29	4	-21/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error when visiting CI root path Closes #14528, closes #14687 See merge request !3377
\| * \| \| \| \| \|	Redirect to root path when visiting `/ci`fix/nomethod-error-on-ci	Grzegorz Bizon	2016-03-29	3	-25/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add definition of before action that has been moved	Grzegorz Bizon	2016-03-25	3	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14528
* \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Marin Jankovski	2016-03-29	6	-16/+387
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'fix-14607' into 'master'	Douwe Maan	2016-03-29	6	-16/+387
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure private project snippets are not viewable by unauthorized people Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607 See merge request !1946
\| \| * \| \| \| \| \|	Ensure project snippets have their own access level	Rémy Coutable	2016-03-25	5	-16/+266
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Ensure private project snippets are not viewable by unauthorized people	Rémy Coutable	2016-03-25	3	-1/+122
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.
* \| \| \| \| \| \|	Merge branch 'rs-remove-wip-tabindex' into 'master'	Douwe Maan	2016-03-29	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove tabstop from the WIP toggle links [ci skip] See merge request !3426
\| * \| \| \| \| \| \|	Remove tabstop from the WIP toggle linksrs-remove-wip-tabindex	Robert Speicher	2016-03-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'fix-dropdown-item-height' into 'master'	Jacob Schatz	2016-03-29	1	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dropdown line height Before ![Screen_Shot_2016-03-28_at_5.54.37_PM](/uploads/67681da80b9104924083f13af3833553/Screen_Shot_2016-03-28_at_5.54.37_PM.png) After ![Screen_Shot_2016-03-28_at_5.57.37_PM](/uploads/5df14c2d131cc88dbc75b87959f56c3c/Screen_Shot_2016-03-28_at_5.57.37_PM.png) See merge request !3431
\| * \| \| \| \| \| \| \|	Set properly line heights	Alfredo Sumaran	2016-03-28	1	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix_rightsidebar_overlapping_build_section' into 'master'	Jacob Schatz	2016-03-29	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix right sidebar overlapping build section in merge request closes #14608 ![build](/uploads/d1902f5fa335274c92ac1b1a8193466f/build.gif) See merge request !3415
\| * \| \| \| \| \| \| \|	fix right sidebar overllaping build section in merge requestfix_rightsidebar_overlapping_build_section	Arinde Eniola	2016-03-27	1	-0/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'add_link_to_fork_counter_button' into 'master'	Jacob Schatz	2016-03-28	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to forks pages in fork counter button closes #14412 ![fork_link](/uploads/5afef05bc592b0cf1c90ae4d154aed87/fork_link.gif) See merge request !3387
\| * \| \| \| \| \| \| \|	add link to forks pages in fork counter buttonadd_link_to_fork_counter_button	Arinde Eniola	2016-03-24	2	-2/+2
\| \| \| \| \| \| \| \| \|