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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Changes after reviewadd-svg-loader	Filipa Lacerda	2017-03-02	4	-6/+21
\|
*	Merge branch 'master' into add-svg-loader	Filipa Lacerda	2017-02-28	149	-710/+2008
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (21 commits) Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups Left align logo; increase max width of title Add newline to end of frontend.md. Clone nested objects from default data. Checks if key is present before accessing it Update CHANGELOG.md for 8.17.1 Document use of AirBnb js styleguide and eslint. Don't allow a project to be shared with an ancestor of the group it is in Fix access to projects shared with a nested group Ignore builds dir when run rubocop check Remove hidden-xs classes from last columns in environments and pipelines table. Transform pipelines table css to match structure of pipelines table Make environments table overflow Use exceptions for MergeService error handling Clarify when to create EE compatibility MR in code review process New runner API returns 204 Backport new behavior to CI API Backport API to V3 Update documentation Return 204 for delete endpoints API project create: Make name or path required Only create unmergeable todos once Put back the new project button ...
\| *	Merge branch '27622-cycle-analytics-loading' into 'master'	Alfredo Sumaran	2017-02-28	1	-2/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Cycle Analytics -> Plan is loading forever Closes #27622 See merge request !9577
\| \| *	Clone nested objects from default data.27622-cycle-analytics-loading	Filipa Lacerda	2017-02-28	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Checks if key is present before accessing it Fix broken test
\| * \|	Merge branch '26348-group-members-rearrange' into 'master'	Dmitriy Zaporozhets	2017-02-28	4	-8/+7
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups Closes #28678 See merge request !9589
\| \| * \|	Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups	Kushal Pandya	2017-02-28	4	-8/+7
\| \| \| \|
\| * \| \|	Merge branch '27934-left-align-logo' into 'master'	Dmitriy Zaporozhets	2017-02-28	3	-24/+17
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Left align logo; increase max width of title Closes #27934 See merge request !9588
\| \| * \| \|	Left align logo; increase max width of title27934-left-align-logo	Annabel Dunstone Gray	2017-02-28	3	-24/+17
\| \| \|/ /
\| * \| \|	Merge branch '28661-ci-tables-buttons' into 'master'	Annabel Dunstone Gray	2017-02-28	7	-113/+97
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI tables action buttons are hidden is smaller screens Closes #28661 See merge request !9578
\| \| * \| \|	Remove hidden-xs classes from last columns in environments and pipelines table.28661-ci-tables-buttons	Filipa Lacerda	2017-02-28	7	-113/+97
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Transform pipelines table css to match structure of pipelines table Make environments table overflow
\| * \| \| \|	Merge branch 'patch-14' into 'master'	Filipa Lacerda	2017-02-28	1	-0/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document use of AirBnb js styleguide and eslint. See merge request !9558
\| \| * \| \| \|	Add newline to end of frontend.md.patch-14	Bryce Johnson	2017-02-28	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Document use of AirBnb js styleguide and eslint.	Bryce Johnson	2017-02-28	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'issue-tags-layout' into 'master'	Annabel Dunstone Gray	2017-02-28	2	-1/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'New Tag' layout on Tags page See merge request !9176
\| \| * \| \| \| \|	Fix 'New Tag' layout on Tags page	Robert Marcano	2017-02-13	2	-1/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '6073_project_api' into 'master'	Sean McGivern	2017-02-28	6	-10/+70
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API project create: Make name or path required Closes #6073 See merge request !9416
\| \| * \| \| \| \|	API project create: Make name or path required	Jarka Kadlecova	2017-02-27	6	-10/+70
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update CHANGELOG.md for 8.17.126790-no-label-color-todos	James Lopez	2017-02-28	12	-44/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master'	Dmitriy Zaporozhets	2017-02-28	2	-3/+25
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't allow a project to be shared with an ancestor of the group it is in Closes #28788 See merge request !9566
\| \| * \| \| \| \|	Don't allow a project to be shared with an ancestor of the group it is in	Douwe Maan	2017-02-28	2	-3/+25
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '27354-navigation-new-button' into 'master'	Dmitriy Zaporozhets	2017-02-28	3	-0/+9
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Put back the new project button Closes #27354 See merge request !9426
\| \| * \| \| \| \|	Put back the new project button27354-navigation-new-button	Annabel Dunstone Gray	2017-02-22	3	-0/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'dm-nested-group-shared-projects' into 'master'	Dmitriy Zaporozhets	2017-02-28	4	-5/+91
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix access to projects shared with a nested group Closes #28787 See merge request !9565
\| \| * \| \| \| \| \|	Fix access to projects shared with a nested groupdm-nested-group-shared-projects	Douwe Maan	2017-02-28	4	-5/+91
\| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Merge branch 'dz-rubocop-skip-builds' into 'master'	Dmitriy Zaporozhets	2017-02-28	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore builds dir when run rubocop check See merge request !9580
\| \| * \| \| \| \| \|	Ignore builds dir when run rubocop checkdz-rubocop-skip-builds	Dmitriy Zaporozhets	2017-02-28	1	-0/+1
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-02-28	1	-11/+9
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'28769-raise-custom-exception-in-all-methods-of-mergeservice-that-want-to-inform-the-user' into 'master' Use exceptions for MergeService error handling Closes #28769 See merge request !9576
\| \| * \| \| \| \| \|	Use exceptions for MergeService error handling28769-raise-custom-exception-in-all-methods-of-mergeservice-that-want-to-inform-the-user	Sean McGivern	2017-02-28	1	-11/+9
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If any method called by `MergeService#execute` raises a `MergeError`, that error's message will be logged, the model will be updated, and the merge will fail.
\| * \| \| \| \| \|	Merge branch 'api-empty-return' into 'master'	Sean McGivern	2017-02-28	100	-477/+1611
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return 204 on all DELETE endpoints Closes #20429 See merge request !9397
\| \| * \| \| \| \|	New runner API returns 204api-empty-return	Robert Schilling	2017-02-28	2	-2/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Backport new behavior to CI API	Robert Schilling	2017-02-28	2	-0/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Backport API to V3	Robert Schilling	2017-02-28	36	-28/+1485
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update documentation	Robert Schilling	2017-02-28	16	-306/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Return 204 for delete endpoints	Robert Schilling	2017-02-28	46	-142/+114
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'ee-compat-code-review' into 'master'	Rémy Coutable	2017-02-28	1	-0/+6
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify when to create EE compatibility MR in code review process See merge request !9575
\| \| * \| \| \| \|	Clarify when to create EE compatibility MR in code review process	Adam Niedzielski	2017-02-28	1	-0/+6
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'only-create-unmergeable-todo-once' into 'master'	Kamil Trzciński	2017-02-28	5	-11/+34
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only create unmergeable todos once Closes #28555 See merge request !9513
\| \| * \| \| \|	Only create unmergeable todos onceonly-create-unmergeable-todo-once	Sean McGivern	2017-02-24	5	-11/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, we created an unmergeable todo when a merge request: 1. Had merge when pipeline succeeds set. 2. Became unmergeable. However, when merge when pipeline succeeds fails due to unmergeability, the flag isn't actually removed. And a merge request can become unmergeable multiple times, as every time the target branch is updated we need to re-check the mergeable status. This means that if the todo was marked done, and the MR was checked again, a new todo would be created for the same event. Instead of checking this, we should create the todo from the service responsible for merging when the pipeline succeeds. That way the todo is guaranteed to only be created when we care about it.
* \| \| \| \| \|	Merge branch 'master' into add-svg-loader	Filipa Lacerda	2017-02-28	44	-187/+508
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Fix migration without DOWNTIME clause specified Fix CSS classes fix missing @ symbol Update CHANGELOG.md for 8.16.7 Update CHANGELOG.md for 8.16.7 Update CHANGELOG.md for 8.16.7 Make RuboCop happy Add development fixtures for nested groups Align last column buttons with new environment button Removed jQuery UI draggable ensure webpack dev server proxy connects regardless of request headers Keep consistent in handling indexOf results Replace setInterval with setTimeout to prevent highly frequent requests Add feature specs for three types of user uploads Minor refactoring of Uploaders Fix #27840 - Improve the search bar experience on mobile Fix false positive caused by non-interpolated string use Fix inline comment images by removing wrapper #20890
\| * \| \| \| \|	Merge branch 'fix-migration-downtime' into 'master'	Rubén Dávila Santos	2017-02-28	1	-0/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migration without DOWNTIME clause specified See merge request !9571
\| \| * \| \| \| \|	Fix migration without DOWNTIME clause specified	Ruben Davila	2017-02-28	1	-0/+2
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'fix-rubocop' into 'master' cherry-picking-regressions-8.17.0	Robert Speicher	2017-02-27	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make RuboCop happy See merge request !9554
\| \| * \| \| \| \|	Make RuboCop happyfix-rubocop	Sean McGivern	2017-02-27	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '25920-create-issue-from-failing-build' into 'master'	Clement Ho	2017-02-27	4	-3/+59
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add button to create issue for failing build Closes #25920 See merge request !9391
\| \| * \| \| \| \| \|	Fix CSS classes	Alex Sanford	2017-02-27	4	-3/+59
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch '20890-comment-image-inline' into 'master' 28711-cherry-picking-ui-regressions-8-17-0	Robert Speicher	2017-02-27	3	-14/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inline comment images by removing wrapper #20890 Closes #20890 See merge request !5804
\| \| * \| \| \| \| \|	Fix false positive caused by non-interpolated string use	Jared Deckard	2016-08-13	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix inline comment images by removing wrapper #20890	Jared Deckard	2016-08-13	3	-12/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-webpack-dev-server-proxy' into 'master'	Douwe Maan	2017-02-27	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken dev environment in master See merge request !9557
\| \| * \| \| \| \| \| \|	fix missing @ symbol	Mike Greiling	2017-02-27	1	-1/+1
\| \| \| \| \| \| \| \| \|