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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update occurrences of MWBS to MWPSfix/mwbs-to-mwps	James Lopez	2017-03-01	57	-233/+389
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename column in the database Rename fields related to import/export feature Rename API endpoints Rename documentation links Rename the rest of occurrences in the code Replace the images that contain the words "build succeeds" and docs referencing to them Make sure pipeline is green and nothing is missing. updated doc images renamed only_allow_merge_if_build_succeeds in projects and fixed references more updates fix some spec failures fix rubocop offences fix v3 api spec fix MR specs fixed issues with partials fix MR spec fix alignment add missing v3 to v4 doc wip - refactor v3 endpoints fix specs fix a few typos fix project specs copy entities fully to V3 fix entity error more fixes fix failing specs fixed missing entities in V3 API remove comment updated code based on feedback typo fix spec
*	Merge branch 'fix-builds-processing' into 'master'	DJ Mountney	2017-03-01	2	-12/+69
\|\ \| \| \| \| \| \| \| \|	Fix concurrent access on builds/register See merge request !9600
\| *	Fix concurrent access on builds/register	Kamil Trzcinski	2017-03-01	2	-12/+69
\|/
*	Merge branch '28808-fix-top-level-constant-referenced' into 'master'	Rémy Coutable	2017-03-01	1	-1/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Don't declare constants in Struct Closes #28808 See merge request !9582
\| *	Don't declare constants in Struct28808-fix-top-level-constant-referenced	Rémy Coutable	2017-02-28	1	-1/+7
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '28818-tech-debt-pipelines-pagination' into 'master'	Alfredo Sumaran	2017-02-28	3	-28/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pagination only changes the page parameter. Closes #28818 See merge request !9581
\| * \|	Pagination only changes the page parameter.28818-tech-debt-pipelines-pagination	Filipa Lacerda	2017-02-28	3	-28/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Fix broken test
* \| \|	Merge branch '23602-show-milestone-id-in-a-consistent-way' into 'master'	Alfredo Sumaran	2017-02-28	4	-6/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show milestone ID in a consistent way Closes #23602 See merge request !8820
\| * \ \	Merge branch '23602-show-milestone-id-in-a-consistent-way' of ↵23602-show-milestone-id-in-a-consistent-way	Pedro Moreira da Silva	2017-02-24	0	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into 23602-show-milestone-id-in-a-consistent-way
\| \| * \| \|	Format milestone header as issues and MRs	Pedro Moreira da Silva	2017-01-26	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Enclose the identifier in strong * Use the % character as in GFM * Remove spaces around en dash for date range
\| * \| \| \|	Fix specs	Pedro Moreira da Silva	2017-02-24	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Format milestone header as issues and MRs	Pedro Moreira da Silva	2017-02-24	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Enclose the identifier in strong * Use the % character as in GFM * Remove spaces around en dash for date range
* \| \| \| \|	Merge branch 'docs/pages' into 'master'	Achilleas Pipinellis	2017-02-28	27	-1288/+1292
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move all Pages related content to a single location Closes #28819 and #28714 See merge request !9583
\| * \| \| \| \|	Move all Pages related content to a single locationdocs/pages	Achilleas Pipinellis	2017-02-28	27	-1288/+1292
\| \| \| \| \| \|
* \| \| \| \| \|	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.