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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'add-missing-api-entities' into 'master'	Rémy Coutable	2017-02-15	2	-3/+25
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add missing api entities Closes #23895 See merge request !7138
\| *	entities: use the RepoCommit entity for branch commits	Ben Boeckel	2017-02-14	2	-3/+25
\| \| \| \| \| \| \| \|	Fixes #23895.
* \|	Merge branch 'dz-nested-groups-improvements-3' into 'master'	Dmitriy Zaporozhets	2017-02-15	2	-9/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Nested groups improvements pt 3 See merge request !9227
\| * \	Merge branch 'master' into 'dz-nested-groups-improvements-3'	Dmitriy Zaporozhets	2017-02-14	3	-189/+8
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/api/projects.md
\| * \| \|	Use Namespace#full_path instead of Namespace#path	Dmitriy Zaporozhets	2017-02-14	1	-9/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Expose Namespace#full_path in namespaces API	Dmitriy Zaporozhets	2017-02-14	1	-1/+8
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'pass_coverage_value_to_commit_status_api' into 'master'	Rémy Coutable	2017-02-15	1	-0/+2
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it possible to pass coverage value to commit status API Closes #27807 See merge request !9214
\| * \|	Make it possible to pass coverage value to commit status API	wendy0402	2017-02-14	1	-0/+2
\| \|/
* \|	API: Consolidate /projects endpoint	Toon Claes	2017-02-14	3	-185/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It consolidates these endpoints: - /projects - /projects/owned - /projects/visible - /projects/starred - /projects/all Into the /projects endpoint using query parameters.
* \|	Move /projects/fork/:id to /projects/:id/fork14492-change-fork-endpoint	Oswaldo Ferreira	2017-02-13	2	-1/+2
\|/
*	Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removal	Oswaldo Ferreira	2017-02-13	1	-0/+10
\|
*	Merge branch '20732_member_exists_409' into 'master'	Sean McGivern	2017-02-13	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add member: Always return 409 when a member exists Closes #20732 See merge request !9093
\| *	Add member: Always return 409 when a member exists	Jarka Kadlecova	2017-02-10	1	-0/+1
\| \|
* \|	Merge branch '1051-api-create-users-without-password' into 'master'	Rémy Coutable	2017-02-10	1	-2/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optionally make users created via the API set their password Closes #1051 See merge request !8957
\| * \|	Optionally make users created via the API set their password	Joost Rijneveld	2017-02-09	1	-2/+3
\| \| \|
* \| \|	Merge branch 'jej-update-mr-state-event-docs' into 'master'	Sean McGivern	2017-02-10	1	-4/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update MergeRequest API state_event option documentation Closes #25566 See merge request !8077
\| * \| \|	Update MergeRequest API state_event option documentationjej-update-mr-state-event-docs	James Edwards-Jones	2017-02-09	1	-4/+5
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'patch-9' into 'master'	Rémy Coutable	2017-02-09	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	oauth2.md: should use the provider's URL which is gitlab.example.com See merge request !8173
\| * \| \|	oauth2.md: should use the provider's URL which is gitlab.example.com	Mehdy Khoshnoody	2016-12-19	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'fixes/namespace-api-documentation' into 'master'	Rémy Coutable	2017-02-09	2	-81/+14
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update API docs for new namespace format Closes #27730 See merge request !9073
\| * \| \|	Update API docs for new namespace format	Markus Koller	2017-02-08	2	-81/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow-up to d05dd81b which changed the nested namespaces in projects to use API::Entities::Namespace instead of exposing all fields. Fixes #27730
* \| \| \|	Merge branch 'dz-nested-groups-api' into 'master'	Dmitriy Zaporozhets	2017-02-09	1	-3/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Nested groups API See merge request !9034
\| * \| \|	Add nested groups to the APIdz-nested-groups-api	Dmitriy Zaporozhets	2017-02-08	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch '23104-remove-public-param-for-projects' into 'master'	Douwe Maan	2017-02-08	1	-3/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: remove `public` param for projects Closes #23104 See merge request !8736
\| * \| \| \|	API: remove `public` param for projects	Toon Claes	2017-02-07	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The create and edit actions for projects had these parameters: - `public` (optional) - if true same as setting `visibility_level = 20` - `visibility_level` (optional) Remove the `public` parameter to avoid contradiction.
* \| \| \| \|	Merge branch 'fix-api-delete-file-example' into 'master'	Rémy Coutable	2017-02-08	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the curl command for deleting files (DELETE instead of PUT) See merge request !8245
\| * \| \| \| \|	Fix the curl command for deleting files (DELETE instead of PUT)	Bruno Melli	2016-12-21	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Remove /projects/:id/keys/.. endpoints	Robert Schilling	2017-02-07	1	-0/+1
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'api-remove-snippets-expires-at' into 'master'	Sean McGivern	2017-02-07	2	-2/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated 'expires_at' from project snippets API Closes #14156 See merge request !8723
\| * \| \| \| \|	Remove deprecated 'expires_at' from project snippets API	Robert Schilling	2017-02-07	2	-2/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '27643-api-sample-fix-for-file-ops' into 'master'	Rémy Coutable	2017-02-06	1	-3/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename example from file_name to file_path Closes #27643 See merge request !8959
\| * \| \| \| \|	Rename example from file_name to file_path	Rick Gudmundson	2017-02-03	1	-3/+3
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Applied in example response for create, update, and delete operations Fixes #27643
* \| \| \| \|	Remove deprecated MR and Issue endpoints and preserve V3 namespace9-0-api-changes	Oswaldo Ferreira	2017-02-06	3	-3/+4
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch 'terminal-max-session-time' into 'master'	Kamil Trzciński	2017-02-06	1	-2/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce maximum session time for terminal websocket connection Closes #26263 See merge request !8413
\| * \| \| \|	Introduce maximum session time for terminal websocket connectionterminal-max-session-time	Adam Niedzielski	2017-02-06	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store the value in application settings. Expose the value to Workhorse.
* \| \| \| \|	Merge branch '22007-unify-projects-search' into 'master'	Rémy Coutable	2017-02-06	2	-0/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify projects search by removing /projects/:search endpoint Closes #22007 See merge request !8877
\| * \| \| \|	Update V3 to V4 docs	Oswaldo Ferreira	2017-02-02	2	-0/+11
\| \| \| \| \|
* \| \| \| \|	Move project services to new location under Integrations	Achilleas Pipinellis	2017-02-03	1	-1/+1
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge branch '24606-force-password-reset-on-next-login' into 'master'	Sean McGivern	2017-02-03	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force new password after password reset via API Closes #24606 See merge request !8933
\| * \| \| \|	Update api docs and minor changes	George Andrinopoulos	2017-02-02	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Update group api doc with full_name and full_path attributes	Dmitriy Zaporozhets	2017-01-30	1	-1/+12
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	update scripts and docs to reference the newly namespaced rake taskrelative-url-assets	Mike Greiling	2017-01-27	1	-1/+1
\|/ / /
* \| \|	Update enviroments.md - example CURL requests had a typo in the URL	Marc van Gend	2017-01-24	1	-2/+2
\| \| \|
* \| \|	Merge branch '25851-document-token-scopes' into 'master'	Rémy Coutable	2017-01-20	1	-0/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation around OAuth/Personal Access Token scopes. Closes #25851 See merge request !8226
\| * \| \|	Add documentation around OAuth/Personal Access Token scopes.	Timothy Andrew	2017-01-19	1	-0/+8
\| \|/ /
* \| \|	Add some API endpoints for time tracking.	Ruben Davila	2017-01-18	2	-0/+279
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New endpoints are: POST :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/time_estimate" POST :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/reset_time_estimate" POST :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/add_spent_time" POST :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/reset_spent_time" GET :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/time_stats"
* \| \|	API: Implement project issues iid param with IssuesFinder and add tests23194-fix-no-milestone-option-for-projects-endpoint	David Eisner	2017-01-12	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use IssuesFinder for the /issues API resouce - Tests for iid filter in project issues API resource - Tests for No Milestone filter in issues API resources The "No Milestone" case was not previously tested, and the `/issues` resource did not support the the `milestone` parameter. - Return issues where all labels match from the issues and project issues API resources, like the group issues resource already does. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6825#note_17474533 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Add support for PlantUML diagrams in Asciidoc.	Horacio Sanson	2017-01-12	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with src pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
* \| \|	Fix groups API to accept path when transferring a project	Mark Fletcher	2017-01-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	* Use standard helpers for finding group and project
* \| \|	Grapify the settings APIgrapify-settings-api	Robert Schilling	2016-12-29	1	-0/+1
\| \| \|