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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \|	Remove Boards::BaseService	Douglas Barbosa Alexandre	2016-10-11	11	-14/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Issue Board API to handle with has_many association	Douglas Barbosa Alexandre	2016-10-11	1	-14/+17
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update board specs to use board factory instead of project_with_board	Douglas Barbosa Alexandre	2016-10-11	6	-15/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactoring service to create a new issue in a board list	Douglas Barbosa Alexandre	2016-10-11	4	-19/+26
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add Project#boards to import/export configuration file	Douglas Barbosa Alexandre	2016-10-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix links to issue boards	Douglas Barbosa Alexandre	2016-10-11	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix rubocop offenses	Douglas Barbosa Alexandre	2016-10-11	2	-12/+12
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove unused Projects::BoardListsController controller	Douglas Barbosa Alexandre	2016-10-11	1	-65/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update endpoints to handle with board issues	Douglas Barbosa Alexandre	2016-10-11	2	-17/+40
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update endpoints to handle with board list changes	Douglas Barbosa Alexandre	2016-10-11	2	-33/+42
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Boards::Lists::DestroyService to remove list on a specic board	Douglas Barbosa Alexandre	2016-10-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Projects::BoardsController#show to look up for a specific board	Douglas Barbosa Alexandre	2016-10-11	2	-11/+41
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add index action to Projects::BoardsController to return project boards	Douglas Barbosa Alexandre	2016-10-11	6	-4/+76
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add Boards::ListService service to list project boards	Douglas Barbosa Alexandre	2016-10-11	2	-0/+51
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Removes all labels from project boards when moving and issue to done	Douglas Barbosa Alexandre	2016-10-11	2	-16/+20
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Boards::Issues::MoveService to move issues on a specific board	Douglas Barbosa Alexandre	2016-10-11	2	-12/+16
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Boards::Issues::ListService to list issues for a board list	Douglas Barbosa Alexandre	2016-10-11	2	-7/+28
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Boards::Lists::MoveService to move lists inside a specific board	Douglas Barbosa Alexandre	2016-10-11	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Boards::Lists::GenerateService to generate for a specific board	Douglas Barbosa Alexandre	2016-10-11	2	-10/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Boards::Lists::CreateService to create lists for a specific board	Douglas Barbosa Alexandre	2016-10-11	3	-13/+12
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add Boards::Lists::ListService to list lists for a specific board	Douglas Barbosa Alexandre	2016-10-11	2	-0/+27
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Boards::CreateService to handle with the has_many association	Douglas Barbosa Alexandre	2016-10-11	4	-25/+25
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Restrict the number of permitted boards per project to one	Douglas Barbosa Alexandre	2016-10-11	2	-1/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Allow projects to have many boards	Douglas Barbosa Alexandre	2016-10-11	2	-3/+2
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'bug/rst-forked-gem' into 'master'	Marin Jankovski	2016-10-13	3	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use forked github-markup gem to enable python3 support with omnibus ## What does this MR do? Changes the version of `github-markup` gem we are using, to be the forked one with the changes to enable python3 support. The change is backward compatible with users using Python 2, and will only be running with Python 3 in Omnibus (with the help of a custom patch we apply there). ## Are there points in the code the reviewer needs to double check? Make sure backward compatibility isn't broken for source installs. ## For the release manager You need to make sure you pickup into stable this merge request as well (for omnibus): https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1015 as it's part of the fix, otherwise package will fail to build. ## Why was this MR needed? We had some regressions with .rst rendering that were fixed, but still some issues with encoding persisted (this MR will fix that). See: https://gitlab.com/gitlab-org/gitlab-ce/issues/21696 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? * gitlab-org/gitlab-ce#21696 * gitlab-org/gitlab-ce#22748 * gitlab-com/support-forum#1097 See merge request !6659
\| * \| \| \| \| \| \| \| \| \|	Updated gitlab-markup forked gem to download from rubygemsbug/rst-forked-gem	Gabriel Mazetto	2016-10-13	3	-9/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use forked github-markup gem to enable python3 support with omnibus	Gabriel Mazetto	2016-10-13	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-grapedsl-variable' into 'master'	Rémy Coutable	2016-10-13	1	-47/+42
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GrapeDSL for variables See merge request !6838
\| * \| \| \| \| \| \| \| \| \| \|	GrapeDSL for variableszj-grapedsl-variable	Z.J. van de Weg	2016-10-13	1	-47/+42
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2016-10-13	3	-1/+17
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'23234-deleting-a-milestone-removes-source-branch-deletion-options-of-associated-merge-requests' into 'master' Maintain "force_remove_source_branch" options on Merge Request unless specified ## What does this MR do? Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge * Closes #23234 * Closes #23191 * Closes #19351 See merge request !6817
\| * \| \| \| \| \| \| \| \| \| \| \|	Maintain "force_remove_source_branch" options on Merge Request unless specified	Mark Fletcher	2016-10-13	3	-1/+17
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'cache-gems-for-tags' into 'master'	Robert Speicher	2016-10-13	1	-0/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep a copy of gems needed by our releases as CI artifacts This is meant as insurance in case a gem GitLab needs is ever removed from rubygems.org. After we merge this, all future GitLab tags will have a CI artifact archive containing all the gems (for all platforms) specified in Gemfile.lock for that revision. Only runs on tags (so we don't constantly create 50MB gem cache bundles). See merge request !6617
\| * \| \| \| \| \| \| \| \| \| \|	Cache gems in CI on tags	Jacob Vosmaer	2016-09-30	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'trigger-docs' into 'master'	Achilleas Pipinellis	2016-10-13	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add job to trigger a docs.gitlab.com build ## What does this MR do? Add a job to build the docs site every time master tests pass. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/doc-gitlab-com/issues/56 See merge request !6850
\| * \| \| \| \| \| \| \| \| \| \| \|	Add job to trigger a docs.gitlab.com buildtrigger-docs	Achilleas Pipinellis	2016-10-13	1	-0/+8
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/cycle-analytics-2-backend' into 'master'	Douwe Maan	2016-10-13	8	-56/+83
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement second iteration of cycle analytics - Change in data measurement Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/22458 Measure everything that happened in the given time range, not only what's been pushed to production. With the exception of the staging and production stages. - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6798
\| * \| \| \| \| \| \| \| \| \| \| \|	updated var name based on feedbackfeature/cycle-analytics-2-backend	James Lopez	2016-10-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	fixed newline	James Lopez	2016-10-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Ignore deployment for statistics in Cycle Analytics, except in staging and ↵	James Lopez	2016-10-12	8	-55/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	production stages Also, updated specs and docs.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ha-doc-secret-names' into 'master'	Achilleas Pipinellis	2016-10-13	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix secret names in HA docs See https://gitlab.com/gitlab-org/gitlab-ee/issues/1110#note_16854559. I don't think this needs a CHANGELOG item really. See merge request !6845
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix secret names in HA docsha-doc-secret-names	Sean McGivern	2016-10-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'project-edit-branch-dropdown-fix' into 'master'	Fatih Acet	2016-10-13	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed default branch dropdown not converting to select2 ## What does this MR do? The LFS dropdown doesn't have the `data` attribute & it isn't needed because it doesn't hide/show any elements. This filters out the `<select>` without that attribute. ## What are the relevant issue numbers? Closes #23200 See merge request !6810
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fixed default branch dropdown not converting to select2project-edit-branch-dropdown-fix	Phil Hughes	2016-10-11	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23200
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'grouped-builds-arrow' into 'master'	Fatih Acet	2016-10-13	2	-7/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix overflow to show grouped builds arrow ## What does this MR do? Removes overflow style so that the arrow shows up again ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-11_at_9.11.55_AM](/uploads/92d2a0c34d2af050e58468c8d61f4cd3/Screen_Shot_2016-10-11_at_9.11.55_AM.png) After: ![Screen_Shot_2016-10-11_at_9.11.41_AM](/uploads/2c4c422a21fb6450d00ae638aef29d89/Screen_Shot_2016-10-11_at_9.11.41_AM.png) Scrolling: ![Screen_Shot_2016-10-11_at_9.40.36_AM](/uploads/e5b1e3125d881c5882cf199026110d48/Screen_Shot_2016-10-11_at_9.40.36_AM.png) See merge request !6808
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow scrolling within grouped pipelinesgrouped-builds-arrow	Annabel Dunstone Gray	2016-10-11	2	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix overflow to show grouped builds arrow	Annabel Dunstone Gray	2016-10-11	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/improve-mrwbs-and-todos-for-pipelines' into 'master'	Kamil Trzciński	2016-10-13	15	-118/+170
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trigger Merge When Pipeline Succeeds on pipeline event ## What does this MR do? This MR is meant to improve merge when build succeeds triggers, which has an impact on performance. - [x] Move Merge When Build Succeeds trigger from commit status to pipeline event - [x] Drop support for triggering event for branches that include commit status submitted without branch (no longer relevant) - [x] Perform Merge When Pipeline Succeeds asynchronously to improve performance and avoid race conditions - [x] Add missing feature test that verifies if MWBS feature actually works and merges merge requests - [x] Update the documentation to reflect change in the behavior Moved to separate merge request: - [ ] Rename Merge When Build Succeeds to Merge When Pipeline Succeeds - [ ] Update documentation to reflect name change for this feature ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !6675
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelines	Grzegorz Bizon	2016-10-12	43	-914/+1994
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Update health_check gem to `~> 2.2.0` API: Version information Revert "Merge branch 'tests-use-tmpfs' into 'master'" Added documentation chapter for Git attributes Use activerecord_sane_schema_dumper Add a separate stage for bundle check Add a bundle check step to ensure dependencies are correct Create a new /templates API namespace Add disabled delete button to protected branches Make spec deterministic refactors tests because of gitlab-test repository changes Addresses Robert's feedback Speed up specs for GET /projects/:id/events API: New /users/:id/events endpoint writes tests to verify the issue is solved and fixes breaking issues. removes inconsistency regarding tagging immediately as merged once you create a branch using new branch button and adds changelog entry
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not return from proc-closure in pipeline transition	Grzegorz Bizon	2016-10-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve desc for pipeline integration spec in MWBS	Grzegorz Bizon	2016-10-12	1	-17/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|