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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Grapify system hooks APIgrapify-system-hooks	Robert Schilling	2016-10-13	1	-31/+29
\|
*	Merge branch 'rs-loosen-request_store' into 'master'	Dmitriy Zaporozhets	2016-10-13	2	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loosen requirement on request_store version This gem follows semantic versioning and will not introduce breaking changes in a minor version. See https://github.com/steveklabnik/request_store#semantic-versioning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868 See merge request !6853
\| *	Loosen requirement on request_store version	Robert Speicher	2016-10-13	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gem follows semantic versioning and will not introduce breaking changes in a minor version. See https://github.com/steveklabnik/request_store#semantic-versioning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
* \|	Merge branch 'feature/issues-board' into 'master'	Sean McGivern	2016-10-13	55	-303/+528
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactoring Issues Board ## What does this MR do? This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid a lot of conflicts with EE multiple boards feature. ## 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)~~ - [x] API support added - Tests - [X] Added for this feature/bug - [ ] 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) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/929 https://gitlab.com/gitlab-org/gitlab-ee/issues/1084 See merge request !6727
\| * \|	Updated JS to work with issue index & showfeature/issues-board	Phil Hughes	2016-10-12	4	-4/+5
\| \| \|
\| * \|	Moved data attribute values into helper method	Phil Hughes	2016-10-12	3	-10/+14
\| \| \|
\| * \|	Fixed JS tests	Phil Hughes	2016-10-11	4	-7/+7
\| \| \|
\| * \|	Updated to pass the board ID with the boards root to save conflicts with EE	Phil Hughes	2016-10-11	4	-8/+11
\| \| \|
\| * \|	Fix board relates specs	Douglas Barbosa Alexandre	2016-10-11	5	-16/+13
\| \| \|
\| * \|	Add Project::BoardLimitExcedeed error class	Douglas Barbosa Alexandre	2016-10-11	2	-2/+4
\| \| \|
\| * \|	Update endpoint path for the frontend	Phil Hughes	2016-10-11	2	-1/+20
\| \| \|
\| * \|	Fix typo on Boards::Issues::ListService spec	Douglas Barbosa Alexandre	2016-10-11	1	-1/+1
\| \| \|
\| * \|	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
\| \| \| \| \| \| \| \|