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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \|
* \| \|	Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'	Douwe Maan	2016-12-27	1	-6/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to add deploy keys with write-access Closes #1376 See merge request !7383
\| * \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-12-20	5	-13/+202
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
\| * \| \|	Merge CSS	Filipa Lacerda	2016-12-12	7	-37/+325
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-12-06	19	-182/+152
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/1376-allow-write-access-deploy-keys * upstream/master: (488 commits) Merge branch 'issue_25064' into 'security' It's secret variables, not secure Fix dead links, add example of debug trace output, simplify titles Authorize users into imported GitLab project Document button secondary states. Update icons and color section Remove unused votes.scss Remove unused errors css Fixed MR widget content wrapping for XS viewports NIGNX -> Nginx Use pry-byebug instead byebug Fixed influence from other specs. Accept `issue new` as command to create an issue Update paranoia from 2.1.4 to 2.2.0. Use the pagination helper in the API Added changelog for #25221 Fixed top margin for Builds page status header information Satisfied eslint Fix compatibility with Internet Explorer 11 for merge requests change the date label to match the date used fix gfm doc typo about two spaces for next line transfer ...
\| * \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-11-22	4	-26/+77
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/1376-allow-write-access-deploy-keys * upstream/master: (497 commits) Use single quote for strings Ue svg from SVGs object Dont trigger CI builds [ci skip] Revert "Test only migrations" Add custom copy for each empty stage Fetch only one revision Highlight nav item on hover Test only migrations Fix migration paths tests Scroll CA stage panel on mobile Fix CSS declaration administer to administrator Move SVGs to JS objects for easy reuse Improve deploy command message No enough data to Not enough data Keep the cookie name as before Fix variable usage Evalute time_ago method instead of printing it Removed button styling from restricted visibility levels and added checkboxes with icons Do not show overview message if there’s already CA data ...
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-11-17	3	-25/+57
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/1376-allow-write-access-deploy-keys * upstream/master: (236 commits) Mention Git strategy none Remove ToC since it's now supported in the docs portal itself Add 8.14 to versions with further additions to review apps Add Limitations sections to environments and review apps docs Add link to environments docs Fix URL to review apps docs Add a prerequisites section, add some links Link to NGINX example project for the time being Get rid most of the irrelevant sections Add note about current limitation in $CI_BUILD_REF_NAME Add an intro and an Overview section for Review Apps WIP review apps Add Review apps link to CI README Add stop environment permissions and remove delete Add note about auto-stopping of environments Update CHANGELOG.md for 8.13.6 Finish "Stopping envs" and "Grouping similar envs" sections Highlight first user autocomplete option Remove ToC and fix headings in Markdown docs Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'" ...
\| * \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-11-10	35	-415/+3053
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/1376-allow-write-access-deploy-keys * upstream/master: (3852 commits) Grapify token API Fix cache for commit status in commits list to respect branches Grapify milestones API Grapify runners API Improve EeCompatCheck, cache EE repo and keep artifacts for the ee_compat_check task Use 'Forking in progress' title when appropriate Fix CHANGELOG after 8.14.0-rc1 tag Update CHANGELOG.md for 8.14.0-rc1 Fix YAML syntax on CHANGELOG entry Remove redundant rescue from repository keep_around Remove redundant space from repository model code Remove order-dependent expectation Minor CHANGELOG.md cleanups Add a link to Git cheatsheet PDF in docs readme Grapify the session API Add 8.13.5, 8.12.9, and 8.11.11 CHANGELOG Merge branch 'unauthenticated-container-registry-access' into 'security' Merge branch '23403-fix-events-for-private-project-features' into 'security' Merge branch 'fix-unathorized-cloning' into 'security' Merge branch 'markdown-xss-fix-option-2.1' into 'security' ...
\| * \| \| \| \| \| \| \|	Added can_push attribute to deploy keys and update docs for API	Ali Ibrahim	2016-08-18	1	-6/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add more storage statistics	Markus Koller	2016-12-21	2	-1/+11
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on /all) and normal users (on /owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.