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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove duplicated parameter description [ci skip]fix-api-docs	Robert Schilling	2016-12-15	1	-1/+0
\|
*	Merge branch 'api-cherry-pick' into 'master'	Rémy Coutable	2016-12-13	1	-0/+39
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API? Closes #25450 See merge request !8047
\| *	API: Ability to cherry-pick a commit	Robert Schilling	2016-12-13	1	-0/+39
\| \|
* \|	API: Ability to get group's project in simple representationapi-simple-group-project	Robert Schilling	2016-12-13	1	-6/+11
\| \|
* \|	Merge branch 'grapify-service-api' into 'master'	Rémy Coutable	2016-12-12	1	-2/+110
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Grapify the service API Related to #22928 See merge request !7970
\| *	Grapify the service APIgrapify-service-api	Robert Schilling	2016-12-12	1	-6/+16
\| \|
\| *	Grapify the service API	Robert Schilling	2016-12-09	1	-2/+100
\| \|
* \|	Merge branch 'features/api-snippets' into 'master'	Sean McGivern	2016-12-12	1	-0/+232
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding support for personal snippet endpoint on the API Closes #22042 See merge request !6373
\| * \|	API: Endpoint to expose personal snippets as /snippets	Guyzmo	2016-12-01	1	-0/+232
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding the necessary API for the new /snippets Restful resource added with this commit. Added a new Grape class `Snippets`, as well as a `PersonalSnippet` entity. Issue: #20042 Merge-Request: !6373 Signed-off-by: Guyzmo <guyzmo+gitlab+pub@m0g.net>
* \| \|	Fix typo in curl example request	Georg Hartmann	2016-12-11	1	-1/+1
\| \| \|
* \| \|	Merge branch 'api-remove-source-branch' into 'master'	Rémy Coutable	2016-12-09	1	-23/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to remove source branch Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23577 See merge request !7804
\| * \| \|	API: Ability to remove source branchapi-remove-source-branch	Robert Schilling	2016-12-04	1	-23/+26
\| \| \| \|
* \| \| \|	Merge branch 'public-tags-api' into 'master' 19703-direct-link-pipelines-into-builds	Douwe Maan	2016-12-08	1	-2/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow public access to some Tag API endpoints Continuation of #4269. See merge request !7896
\| * \| \| \|	Allow public access to some Tag API endpointspublic-tags-api	Rémy Coutable	2016-12-07	1	-2/+5
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '24537-reenable-private-token-with-sudo' into 'master'	Douwe Maan	2016-12-08	1	-1/+50
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reenables /user API request to return private-token if user is admin and requested with sudo ## What does this MR do? Reenables the API /users to return `private-token` when sudo is either a parameter or passed as a header and the user is admin. ## Screenshots (if relevant) Without sudo: ![Screen_Shot_2016-11-21_at_11.44.49](/uploads/ebecf95dbadaf4a159b80c61c75771d9/Screen_Shot_2016-11-21_at_11.44.49.png) With sudo: ![Screen_Shot_2016-11-21_at_11.45.52](/uploads/f25f9ddffcf2b921e9694e5a250191d3/Screen_Shot_2016-11-21_at_11.45.52.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 #24537 See merge request !7615
\| * \| \| \|	adds impersonator variable and makes sudo usage overall more clear24537-reenable-private-token-with-sudo	tiagonbotelho	2016-12-07	1	-1/+50
\| \| \| \| \|
* \| \| \| \|	Merge branch '24565-fix-api-example-typos' into 'master'	Rémy Coutable	2016-12-07	2	-9/+9
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in API doc examples ## What does this MR do? Fixes a typo in the API docs. The `curl` examples in [build_triggers.md](doc/api/build_triggers.md) and [build_variables.md](doc/api/build_variables.md) all have a typo in the auth header. They all say `PRIVATE_TOKEN` when it should be `PRIVATE-TOKEN`. ## What are the relevant issue numbers? Fixes #24565 See merge request !7514
\| * \| \| \|	Fix typos in API doc examples	Ryan O'Boyle	2016-11-16	2	-9/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch '23589-open-issue-for-mr' into 'master'	Sean McGivern	2016-12-06	1	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create an issue for all unresolved discussions in an MR See merge request !7180
\| * \| \| \| \|	Feature: delegate all open discussions to Issue	Bob Van Landuyt	2016-12-05	1	-1/+2
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue.
* \| \| \| \|	Merge branch 'document-public-project-api' into 'master'	Douwe Maan	2016-12-06	1	-4/+44
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the public Project API and document `GET /projects/:id/users` Documentation was not updated in !7843. Also the `GET /projects/:id/users` endpoint was not documented at all! See merge request !7897
\| * \| \| \|	Document the public Project API and document `GET /projects/:id/users`document-public-project-api	Rémy Coutable	2016-12-02	1	-4/+44
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master'	Kamil Trzciński	2016-12-05	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename MWBS service to Merge When Pipeline Succeeds ## What does this MR do? This MR renames Merge When Build Succeeds feature to Merge When Pipeline Succeeds, because we recently changed the behavior, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6675. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing ## What are the relevant issue numbers? Closes #23354 See merge request !7135
\| * \| \|	Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds	Grzegorz Bizon	2016-11-30	15	-164/+56
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (110 commits) Rewrite an HTTP link to use HTTPS Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90ac Add blue back to sub nav active Remove JSX/React eslint plugins. Fix a transient spec failure Adds hoverstates for collapsed Issue/Merge Request sidebar Moved groups above projects Add StackProf to the Gemfile, along with a utility to get a profile for a spec Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1 Add a CHANGELOG entry Alert user when logged in user email is not the same as the invitation Expose timestamp in build entity used by serializer Rename `MergeRequest#pipeline` to `head_pipeline` Remove unnecessary database indexes CE-specific changes gitlab-org/gitlab-ee#1137 Fixing typo & Clarifying Key name fix started_at check fix blob controller spec failure - updated not to use file-path- fix blob controller spec failure Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' ... Conflicts: app/controllers/projects/merge_requests_controller.rb lib/api/merge_requests.rb spec/requests/api/merge_requests_spec.rb
\| * \ \ \	Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds	Grzegorz Bizon	2016-11-25	7	-33/+103
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (312 commits) Fix bad selection on dropdown menu for tags filter Fixed issue boards scrolling with a lot of lists & issues You can only assign default_branch when editing a project ... Don't convert data which already is the target type Stop supporting Google and Azure as backup strategies renames some of the specs and adds changelog entry Fixed dragging issue moving wrong issue after multiple drags of issue Fixed issue boards issue sorting when dragging issue into list Rephrase some system notes to be compatible with new system note style Add missing JIRA file that redirects to the new location Fix documentation to create the `pg_trm` extension before creating the DB Document that we always use `do...end` for `before` in RSpec Backport Note#commands_changes from EE Log mv_namespace parameters Add default_branch attr to Project API payload in docs. Fix title case to sentence case properly escape username validation error message flash Remove header ids from University docs Add missing documentation. Added test that checks the correct select box is there for the LFS ... ... Conflicts: app/services/system_note_service.rb spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb spec/services/system_note_service_spec.rb
\| * \| \| \| \|	Update some docs to reflect MWPS name change	Grzegorz Bizon	2016-11-21	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	API: Expose committer details for a commitapi-expose-commiter-details	Robert Schilling	2016-12-01	1	-0/+8
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'api-branch-status' into 'master'	Rémy Coutable	2016-11-30	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose branch status Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938 See merge request !7796
\| * \| \| \| \|	API: Expose branch statusapi-branch-status	Robert Schilling	2016-11-30	1	-0/+5
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'grapify-files-api' into 'master'	Rémy Coutable	2016-11-30	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the files API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7806
\| * \| \| \| \|	Grapify the files APIgrapify-files-api	Robert Schilling	2016-11-30	1	-2/+2
\| \|/ / / /
* \| \| \| \|	Grapify the projects APIgrapify-projects-api	Robert Schilling	2016-11-28	1	-0/+1
\|/ / / /
* \| \| \|	Merge branch 'zj-expose-coverage-pipelines' into 'master'	Rémy Coutable	2016-11-25	1	-6/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose coverage on GET pipelines/:id Closes gitlab-org/gitlab-ce#24801 See merge request !7670
\| * \| \| \|	Add docs for pipeline coverage	Z.J. van de Weg	2016-11-25	1	-6/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'issue-24534' into 'master'	Rémy Coutable	2016-11-25	14	-158/+44
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary sentences for return codes in the API documentation Closes #24534 See merge request !7511
\| * \| \| \|	Remove unnecessary sentences for status codes in the API documentation	Luis Alonso Chavez Armendariz	2016-11-24	14	-158/+44
\| \|/ / /
* \| \| \|	Merge branch 'rephrase-system-notes' into 'master'	Robert Speicher	2016-11-25	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rephrase some system notes to be compatible with new system note style See merge request !7692
\| * \| \| \|	Rephrase some system notes to be compatible with new system note stylerephrase-system-notes	Douwe Maan	2016-11-24	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	You can only assign default_branch when editing a project or when creating a ↵	Robert Schilling	2016-11-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	project for a specified user [ci skip] You can only assign default_branch when editing a project [ci skip]
* \| \| \| \|	Add default_branch attr to Project API payload in docs.update-project-api-doc	Ruben Davila	2016-11-23	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'api-delete-group-share' into 'master'	Rémy Coutable	2016-11-23	1	-0/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Add endpoint to delete a group share Closes #24771 See merge request !7662
\| * \| \| \| \|	API: Add endpoint to delete a group shareapi-delete-group-share	Robert Schilling	2016-11-23	1	-0/+19
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Add a starting date to milestonesmilestone_start_date	Valery Sizov	2016-11-23	1	-0/+3
\| \|/ / / \|/\| \| \|
* \| \| \|	Add changes to JIRA api docs	Achilleas Pipinellis	2016-11-22	1	-9/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Document both valid cases for API iid filterfix-api-iid-filter	Robert Schilling	2016-11-22	2	-2/+4
\| \| \| \|
* \| \| \|	Fix IID filter for merge requests and milestones	Robert Schilling	2016-11-22	2	-3/+3
\|/ / /
* \| \|	Merge branch 'grapify-users-api' into 'master'	Rémy Coutable	2016-11-21	1	-22/+22
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the users API Certain endpoints return different entities based on which user issues the request. Right now, I am not aware how to specify multiple entities as part of the description block of the endpoint. @rymai Do you know something about that. ## What are the relevant issue numbers? Related to #22928 See merge request !7147
\| * \| \|	Grapify the users APIgrapify-users-api	Robert Schilling	2016-11-21	1	-22/+22
\| \| \| \|
* \| \| \|	Merge branch 'create-pipeline-endpoint' into 'master'	Rémy Coutable	2016-11-21	1	-0/+46
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
\| * \| \|	Add api endpoint for creating a pipeline	Ido Leibovich	2016-11-18	1	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.