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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update user routing spec after constrainer logic changeddz-root-url	Dmitriy Zaporozhets	2016-10-06	1	-1/+1
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Make user constrainer lookup same as controller and add more constrainer tests	Dmitriy Zaporozhets	2016-10-06	4	-2/+21
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Fix users feature spec	Dmitriy Zaporozhets	2016-10-06	1	-13/+2
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Change user & group landing page routing from /u/:name & /groups/:name to /:name	Dmitriy Zaporozhets	2016-10-06	15	-27/+119
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'akramfares/gitlab-ce-master'	Rémy Coutable	2016-10-06	4	-0/+16
\|\ \| \| \| \| \| \|	See !6543.
\| *	Add tag shortcut from the Commit page	Akram FARES	2016-10-06	4	-0/+16
\|/ \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'creative-commons-zero' into 'master'	Rémy Coutable	2016-10-06	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added CC0 license to list of licenses Adds a "license" (actually a deed, because its a dedication to the public domain) to the appropriate place in the documentation. It adds another relevant license to our documentation. See merge request !6622
\| *	Added CC0 license to list of licenses	Matt Lee	2016-09-29	1	-0/+2
\| \|
* \|	Merge branch 'issue-boards-new-issue' into 'master'	Fatih Acet	2016-10-06	16	-24/+380
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue boards new issue form ## What does this MR do? Adds a new issue form into the issue boards lists. ## Screenshots (if relevant) ![Screen_Shot_2016-10-03_at_14.57.30](/uploads/17fe6cd37bd020a2ee1688e0b496c18f/Screen_Shot_2016-10-03_at_14.57.30.png) ![Screen_Shot_2016-10-03_at_14.57.32](/uploads/c3f12bcb9ff9a0e7ce5b0bb06dfb0dd7/Screen_Shot_2016-10-03_at_14.57.32.png) ## What are the relevant issue numbers? Part of #21219 See merge request !6653
\| * \|	Remove the code finding an issue by undefined	Phil Hughes	2016-10-06	1	-2/+1
\| \| \|
\| * \|	Shows error if response returns an errorissue-boards-new-issue	Phil Hughes	2016-10-06	2	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \|	Added validation so the user shouldnt be able to submit the form without the title present
\| * \|	Fix form not re-enabling thanks to jQuery	Phil Hughes	2016-10-06	5	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Stop issue being dragged if it doesn't have an ID
\| * \|	Update CHANGELOG	Douglas Barbosa Alexandre	2016-10-06	1	-0/+1
\| \| \|
\| * \|	Add tests to Projects::Boards::IssuesController#create action	Douglas Barbosa Alexandre	2016-10-06	1	-7/+57
\| \| \|
\| * \|	Add service to create a new issue in a board list	Douglas Barbosa Alexandre	2016-10-06	3	-11/+67
\| \| \|
\| * \|	Add authorization to Projects::Boards::IssuesController#create action	Douglas Barbosa Alexandre	2016-10-06	1	-0/+5
\| \| \|
\| * \|	Changed new issue button permissions	Phil Hughes	2016-10-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This is because contributors can't create issues with labels
\| * \|	Added tooltip to new issue button	Phil Hughes	2016-10-06	1	-2/+4
\| \| \|
\| * \|	Made the CSS a bit more reasonable	Phil Hughes	2016-10-06	2	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Changed how the data is passed into Vue resource
\| * \|	Changed how button is hidden when blank list	Phil Hughes	2016-10-06	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Added for attribute to title label
\| * \|	Added tests	Phil Hughes	2016-10-06	2	-1/+81
\| \| \|
\| * \|	Moved form outside of list	Phil Hughes	2016-10-06	3	-23/+32
\| \| \| \| \| \| \| \| \| \| \| \|	This was causing issues with moving from the done list
\| * \|	Fixed issue with backlog list not saving	Phil Hughes	2016-10-06	4	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue when dragging cards
\| * \|	Added ability to save the new issue	Phil Hughes	2016-10-06	8	-7/+54
\| \| \|
\| * \|	Add new issue form to lists	Phil Hughes	2016-10-06	5	-5/+89
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #21219
* \| \|	Merge branch 'revert/5991' into 'master'	Sean McGivern	2016-10-06	4	-13/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Label list shows all issues (opened or closed) with that label" ## What does this MR do? Revert changes made on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5991. Reasoning here: https://gitlab.com/gitlab-org/gitlab-ce/issues/21691#note_16516861 ## Does this MR meet the acceptance criteria? - [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 - [ ] 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? Closes #21691 See merge request !6695
\| * \| \|	Update CHANGELOGrevert/5991	Douglas Barbosa Alexandre	2016-10-06	1	-0/+1
\| \| \| \|
\| * \| \|	Revert "Label list shows all issues (opened or closed) with that label"	Douglas Barbosa Alexandre	2016-10-06	3	-13/+9
\| \| \| \|
* \| \| \|	Re-add CHANGELOG entries removed by merge (9cc700315)	Rémy Coutable	2016-10-06	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'new-merge-requests-commit-tab-active' into 'master'	Fatih Acet	2016-10-06	11	-52/+101
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MergeRequest new form load diff asynchronously ## What does this MR do? Don't return diff tab content from the server when request for a new merge request ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid 502 errors due to this controller action takes to much time ## What are the relevant issue numbers? Relates #13912 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5844
\| * \| \| \|	MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-active	Paco Guzman	2016-10-06	11	-52/+101
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/github-importer-client' into 'master'	Rémy Coutable	2016-10-06	1	-2/+12
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken handling of certain calls in GitHub importer client ## What does this MR do? It changes/fixes the behavior of request handling in GH client. Now it returns the response directly if it's not a collection of resources. Otherwise, it checks for a passed block, if true, then it yield each page to said block, if not, it collects all response in a single array then returns it. Closes #22998 See merge request !6703
\| * \| \| \|	Fix broken handling of certain calls in GitHub importer clientfix/github-importer-client	Ahmad Sherif	2016-10-06	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #22998
* \| \| \| \|	Merge branch 'rc-use-grape-dsl-to-document-members-api' into 'master'	Robert Speicher	2016-10-06	3	-97/+79
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Use Grape DSL to document access requests and members endpoints Part of #21979, depends on gitlab-org/gitlab-ce!6267 and gitlab-org/gitlab-ce!6266. See merge request !6269
\| * \| \| \| \|	Use Grape DSL to document methods and their paramsrc-use-grape-dsl-to-document-members-api	Rémy Coutable	2016-10-05	3	-97/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit'	Rémy Coutable	2016-10-06	10	-20/+575
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See !6096.
\| * \| \| \| \| \|	multi-file commit	Marc Siegfriedt	2016-10-05	10	-20/+575
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add docs and tests - add additional validation allow move without content updated response
* \| \| \| \| \| \|	Merge branch 'issue-board-api-support' into 'master'	Dmitriy Zaporozhets	2016-10-06	6	-1/+577
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue Board API support ## What does this MR do? Adds support for Issue Board in the API. ## Are there points in the code the reviewer needs to double check? ~~Double check whether the Issue Board list movement fix is needed.~~ Moved to a separate issue. [#22890](https://gitlab.com/gitlab-org/gitlab-ce/issues/22890) ## Why was this MR needed? Currently the API offers partial support to a project's Issue Board indirectly through Labels. This MR adds support for listing, creating, moving and removing board lists. ## Does this MR meet the acceptance criteria? - [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) - [X] API support added - 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 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? [#22195](https://gitlab.com/gitlab-org/gitlab-ce/issues/22195) See merge request !6646
\| * \| \| \| \| \| \|	Added Issue Board API support	Andre Guedes	2016-10-05	6	-1/+577
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Includes documentation and tests
* \| \| \| \| \| \| \|	Merge branch 'jeroenj/gitlab-ce-group-milestone-archived-projects'	Rémy Coutable	2016-10-06	2	-19/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Don't include archived projects when creating group milestones	Jeroen Jacobs	2016-10-05	2	-2/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '18663-perform-housekeeping-with-proper-connection-pool-size' ↵	Yorick Peterse	2016-10-06	3	-1/+46
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Gitlab::Redis bigger connection pool on sidekiq workers See merge request !6657
\| * \| \| \| \| \| \| \|	Use higher size on Gitlab::Redis connection pool on Sidekiq servers	Paco Guzman	2016-10-06	3	-1/+46
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '21337-introduce-git-strategy-none' into 'master'	Achilleas Pipinellis	2016-10-06	1	-8/+26
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document GIT_STRATEGY=none ## What does this MR do? Adds documentation for the new `GIT_STRATEGY=none` option in GitLab Runner v1.7 ## Are there points in the code the reviewer needs to double check? Speling and grammar, of course. I'm using the term 'project workspace' to refer to the build directory, which is a Jenkins-ism. Is there preferred alternative wording? ## Why was this MR needed? Discoverability of new feature ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - <strike>[ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added</strike> - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - <strike>[ ] API support added</strike> - <strike>Tests</strike> - <strike>[ ] Added for this feature/bug</strike> - <strike>[ ] All builds are passing</strike> - <strike>[ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)</strike> - [ ] 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 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? Closes #21337 Depends on http://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/332 See merge request !6577
\| * \| \| \| \| \| \| \|	Document GIT_STRATEGY=none	Nick Thomas	2016-10-05	1	-8/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'docs/ca-feedback' into 'master'	Achilleas Pipinellis	2016-10-06	2	-15/+73
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more info in Cycle Analytics docs - Clarify the Plan to Code stages in Cycle Analytics docs based on feedback https://about.gitlab.com/2016/09/21/cycle-analytics-feature-highlight/#comment-2915715168 - Add a workflow example See merge request !6562
\| * \| \| \| \| \| \| \|	Clarify some more the Cycle Analytics workflow example	Achilleas Pipinellis	2016-10-06	1	-16/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Add example Cycle Analytics workflowdocs/ca-feedback	Achilleas Pipinellis	2016-10-04	1	-5/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Take a new screenshot for Cycle Analytics	Achilleas Pipinellis	2016-10-03	1	-0/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Clarify that the `production` environment is case-sensitive	Achilleas Pipinellis	2016-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22533