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

	Commit message (Collapse)	Author	Age	Files	Lines
*	updated specfix/fogbugz-import	James Lopez	2016-03-31	1	-1/+1
\|
*	spec and fix for fogbugz lonely user problem	James Lopez	2016-03-30	2	-1/+25
\|
*	Merge branch 'patch/fix-mergerequest-diff' into 'master'	Robert Speicher	2016-03-30	4	-7/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Raw / Rendered diff producing different results on merge requests The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`. Fixes #14680, #3017 See merge request !3450
\| *	Fixed MergeRequestController specpatch/fix-mergerequest-diff	Gabriel Mazetto	2016-03-30	2	-2/+3
\| \|
\| *	We need `sha` reference from `diff_base_commit` to generate the diff	Gabriel Mazetto	2016-03-29	1	-2/+2
\| \|
\| *	Use `diff_base_commit` instead of `target_branch` to generate diffs	Gabriel Mazetto	2016-03-29	2	-6/+6
\| \|
* \|	Merge branch 'refactor/project-badges-interface' into 'master'	Robert Speicher	2016-03-30	3	-2/+99
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor builds badge, encapsulate inside a class This merge requests attempts to introduce interface for all badges. Currently we only have a build badge, but other badges are in plans, like coverage badge. See merge request !3403
\| * \|	Extend specs for build badgerefactor/project-badges-interface	Grzegorz Bizon	2016-03-29	1	-9/+48
\| \| \|
\| * \|	Refactor builds badge, encapsulate inside a class	Grzegorz Bizon	2016-03-29	3	-2/+60
\| \| \|
* \| \|	Add 8.6.2 CHANGELOG items	Rémy Coutable	2016-03-30	1	-4/+22
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'functional-closed-sidebar' into 'master'	Dmitriy Zaporozhets	2016-03-30	9	-26/+116
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Functional closed sidebar Adds functionality to include the closed sidebar. When sidebar is closed the details will be visible once changed in open sidebar. This MR fixes some bugs and adds some features from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3175 Fixes: #13594 See merge request !3411
\| * \| \|	Remove console logs	Jacob Schatz	2016-03-30	1	-1/+0
\| \| \| \|
\| * \| \|	Off the event initially	Jacob Schatz	2016-03-30	1	-1/+2
\| \| \| \|
\| * \| \|	Collapsed sidebar opens over instead of pushing content.	Jacob Schatz	2016-03-30	2	-1/+7
\| \| \| \|
\| * \| \|	Sidebar collapse update issue	Jacob Schatz	2016-03-30	7	-18/+71
\| \| \| \|
\| * \| \|	User selection from collapsed sidebar	Jacob Schatz	2016-03-30	1	-0/+17
\| \| \| \|
\| * \| \|	Add json response for user avatar in merge request	Jacob Schatz	2016-03-30	1	-1/+1
\| \| \| \|
\| * \| \|	Make changed values visible in minimized sidebar.	Jacob Schatz	2016-03-30	3	-25/+39
\|/ / /
* \| \|	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
\| \| \| \| \| \| \| \|