Commit Graph

1108 Commits

Author SHA1 Message Date
Mark Fletcher 61baf3528d Enable filtering milestones by search criteria in the API
- Also remove a redundant test
2017-03-02 10:07:57 +05:30
Douwe Maan b6a945b393 Merge branch 'api-v4-doc' into 'master'
Use v4 endpoint in API docs

See merge request !9631
2017-03-01 20:31:23 +00:00
Douwe Maan 7e2ad5d47a Merge branch 'fix/mwbs-to-mwps' into 'master'
Rename MWBS to MWPS

Closes #24707

See merge request !9335
2017-03-01 20:30:51 +00:00
Kamil Trzciński b3700dea01 Merge branch '27142-api-replace-destroy-with-stop-environment' into 'master'
API: Add environment action with /stop action

Closes #27142

See merge request !8808
2017-03-01 20:26:58 +00:00
Marius Kleiner 5c915f4236 Clarification of list repository tree API call 2017-03-01 18:43:23 +00:00
Robert Schilling 1ead6a9793 Use v4 endpoint in API docs 2017-03-01 18:39:40 +01:00
Rémy Coutable 462526280a Merge branch 'feature/fix_tag_docs_parent_ids' into 'master'
Docs: Tags: Fix typo in parent_ids in example response

See merge request !9550
2017-03-01 13:22:34 +00:00
Tiago Botelho 2b474dc2b2 refactors finder and correlated code 2017-03-01 13:11:11 +00:00
James Lopez a0101ebf84 Update occurrences of MWBS to MWPS
Rename column in the database
 Rename fields related to import/export feature
 Rename API endpoints
 Rename documentation links
 Rename the rest of occurrences in the code
 Replace the images that contain the words "build succeeds" and docs referencing to them
 Make sure pipeline is green and nothing is missing.

updated doc images

renamed only_allow_merge_if_build_succeeds in projects and fixed references

more updates

fix some spec failures

fix rubocop offences

fix v3 api spec

fix MR  specs

fixed issues with partials

fix MR spec

fix alignment

add missing v3 to v4 doc

wip - refactor v3 endpoints

fix specs

fix a few typos

fix project specs

copy entities fully to V3

fix  entity error

more fixes

fix failing specs

fixed missing entities in V3 API

remove comment

updated code based on feedback

typo

fix spec
2017-03-01 12:02:02 +01:00
Jarka Kadlecova c6181f9799 API issues - support filtering by iids 2017-03-01 07:28:10 +01:00
Tiago Botelho 9f2e4742e3 applies relevant changes to the code and code structure 2017-02-28 22:15:40 +00:00
Tiago Botelho f0ea7130f7 refactors documentation and personal access tokens form to not allow admins to generate non impersionation tokens 2017-02-28 22:15:40 +00:00
Simon Vocella 09dd6a7ead add documentation and changelog entry for user personal access tokens api 2017-02-28 22:15:39 +00:00
Sean McGivern 0226fb0e1f Merge branch '6073_project_api' into 'master'
API project create: Make name or path required

Closes #6073

See merge request !9416
2017-02-28 16:29:00 +00:00
Toon Claes 8c569e21d5 Add environment `/stop` action
Add endpoint to stop an environment through the API.
2017-02-28 15:34:38 +01:00
Robert Schilling f2dd260413 Update documentation 2017-02-28 08:32:39 +01:00
Douwe Maan 23659c52da Merge branch 'mock-ci-service' into 'master'
Add Mock CI service/integration

See merge request !9250
2017-02-27 16:43:05 +00:00
Michael Frister 687bb3ca68 Docs: Tags: Fix typo in parent_ids in example response 2017-02-27 12:31:39 +01:00
Jarka Kadlecova 08ee177d6f API project create: Make name or path required 2017-02-27 07:55:45 +01:00
Eric Eastwood 1c85d86d19 Add MockCiService integration
MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9250/

See https://gitlab.com/madlittlemods/gl-mock-ci-service
2017-02-24 20:01:36 -06:00
Robert Schilling 0394055112 API: Return 400 for all validation erros in the mebers API 2017-02-24 20:13:27 +01:00
Sean McGivern 806c748852 Merge branch 'master' into 'api-remove-owned-groups'
# Conflicts:
#   doc/api/v3_to_v4.md
2017-02-24 11:26:44 +00:00
Robert Schilling a82e3d30b2 Update documentation 2017-02-24 10:31:45 +01:00
Oswaldo 2b001d9e7a Return 202 with JSON body on async removals on V4 API 2017-02-23 19:55:13 -03:00
Rémy Coutable f6443a4564 Merge branch 'api-subscribe-doc' into 'master'
Use POST in the endpoint description for :resource/unsubscribe

See merge request !9469
2017-02-23 16:27:15 +00:00
Robert Schilling abbc592ee1 Use POST in the endpoint description for :ressource/unsubscribe [ci skip] 2017-02-23 13:37:19 +01:00
Robert Schilling 931db7963e Merge branch 'master' into 'api-notes-entity-fields'
# Conflicts:
#   doc/api/v3_to_v4.md
2017-02-22 17:32:41 +00:00
Sean McGivern 33e4294fc8 Merge branch '28458-present-gitlab-version-for-v4-changes-on-docs' into 'master'
Present GitLab version for each V3 to V4 API change on v3_to_v4.md

Closes #28458

See merge request !9425
2017-02-22 17:18:35 +00:00
Rémy Coutable 91335c59fd Merge branch '27032-add-a-house-keeping-api-call' into 'master'
Add housekeeping endpoint for Projects API

Closes #27032

See merge request !9421
2017-02-22 15:49:51 +00:00
Toon Claes eeb567d1b1 Add Merge Request link to the v3 to v4 documentation
Similar to changelog, mention the Merge Request id & link for each
change.
2017-02-22 16:44:09 +01:00
Oswaldo Ferreira 9f56b57b55 Present GitLab version for each V3 to V4 API change on v3_to_v4.md 2017-02-22 16:35:20 +01:00
Mark Fletcher d3425933dd Add housekeeping endpoint for Projects API 2017-02-22 17:40:20 +05:30
Robert Schilling 0b402e11e3 Remove deprecated `upvotes` and `downvotes` from the notes API 2017-02-22 13:07:49 +01:00
Rémy Coutable 87411889b9 Merge branch '22132-rename-branch-name-params-to-branch' into 'master'
Standardize branch name params as `branch` on V4 API

Closes #22132

See merge request !8936
2017-02-22 11:47:13 +00:00
Sean McGivern 99d0bc3d55 Merge branch 'api-subscription-restful' into 'master'
API: Make subscription API more RESTfuL

Closes #28327

See merge request !9325
2017-02-22 11:29:53 +00:00
Robert Schilling ca68c81733 Update documentation 2017-02-22 09:43:27 +01:00
Oswaldo Ferreira c79bbe26ab Change branch_name param to branch throughout V4 API 2017-02-21 16:33:14 -03:00
Filipa Lacerda 7094f50d38 Merge branch 'rename-retry-failed-pipeline-to-retry' into 'master'
Rename retry failed button on pipeline page to just retry

See merge request !9369
2017-02-21 18:24:54 +00:00
Robert Schilling 55f2425a67 API: Make subscription API more RESTfuL 2017-02-21 17:44:44 +01:00
Robert Schilling 1ef911f0e0 API: Use POST requests to mark todos as done 2017-02-21 12:01:15 +01:00
Rémy Coutable fe9cae2618 Merge branch '26315-unify-labels-filter-behavior' into 'master'
Unify issues search behavior by always filtering when ALL labels matches

Closes #26315

See merge request !8849
2017-02-20 19:26:30 +00:00
Rémy Coutable 5f0e4619dc Merge branch 'api-star-restful' into 'master'
API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`

Closes #28328

See merge request !9328
2017-02-20 17:04:30 +00:00
Oswaldo Ferreira c2426b4eac Unify issues search behavior by always filtering when ALL labels matches 2017-02-20 13:21:22 -03:00
Robert Speicher 6df411b442 Merge branch 'fix-grammar' into 'master'
Fix some grammar in the API docs

See merge request !9379
2017-02-20 16:08:37 +00:00
dimitrieh b86640fee9 fixed specs + docs 2017-02-20 17:08:29 +01:00
Robert Schilling 7d31cf8601 Fix some grammar in the API docs 2017-02-20 15:54:37 +01:00
Robert Schilling 8f690604a5 API: Use POST to (un)block a user 2017-02-20 15:18:40 +01:00
Robert Schilling 039c6d60fa API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` 2017-02-20 15:14:48 +01:00
Robert Schilling e7551214f3 API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable` 2017-02-20 09:33:42 +01:00
Rémy Coutable 10ad2f7735 Merge branch 'paginate-all-the-things' into 'master'
Paginate all the things

Closes #8099

See merge request !8606
2017-02-17 13:54:46 +00:00
Rémy Coutable 5cc9ebbe14 Merge branch '22018-api-milestone-merge-requests' into 'master'
Add API endpoint to get all milestone merge requests

Closes #22018

See merge request !9298
2017-02-17 12:48:29 +00:00
Joren De Groof aa7c8be5c6 Add API endpoint to get all milestone merge requests 2017-02-17 09:47:23 +01:00
Robert Schilling ce54a801fe Backport API to v3 2017-02-17 09:05:24 +01:00
Annabel Dunstone Gray c780ad0e92 Remove all instances of theme_id; require downtime 2017-02-15 13:31:18 -06:00
Rémy Coutable f3de1c579e Merge branch 'add-missing-api-entities' into 'master'
Add missing api entities

Closes #23895

See merge request !7138
2017-02-15 16:24:37 +00:00
Dmitriy Zaporozhets 6038355f9e Merge branch 'dz-nested-groups-improvements-3' into 'master'
Nested groups improvements pt 3

See merge request !9227
2017-02-15 09:41:45 +00:00
Rémy Coutable fea03a73cf Merge branch 'pass_coverage_value_to_commit_status_api' into 'master'
Make it possible to pass coverage value to commit status API

Closes #27807

See merge request !9214
2017-02-15 09:25:26 +00:00
Dmitriy Zaporozhets efc82ebf3f Merge branch 'master' into 'dz-nested-groups-improvements-3'
# Conflicts:
#   doc/api/projects.md
2017-02-14 19:09:52 +00:00
Ben Boeckel 309aee45b6 entities: use the RepoCommit entity for branch commits
Fixes #23895.
2017-02-14 13:22:14 -05:00
Dmitriy Zaporozhets 6676b4f0dd
Use Namespace#full_path instead of Namespace#path
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-02-14 18:38:20 +02:00
Toon Claes 4e9e29d295 API: Consolidate /projects endpoint
It consolidates these endpoints:
 - /projects
 - /projects/owned
 - /projects/visible
 - /projects/starred
 - /projects/all

Into the /projects endpoint using query parameters.
2017-02-14 16:41:57 +01:00
Dmitriy Zaporozhets c48539463f
Expose Namespace#full_path in namespaces API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-02-14 15:34:36 +02:00
wendy0402 79ce7579bb Make it possible to pass coverage value to commit status API 2017-02-14 09:32:25 +07:00
Oswaldo Ferreira c2102e6e3b Move /projects/fork/:id to /projects/:id/fork 2017-02-13 16:58:11 -02:00
Oswaldo Ferreira 8adc356902 Remove deprecated templates endpoints in V4 2017-02-13 13:59:17 -02:00
Sean McGivern d8345a5d43 Merge branch '20732_member_exists_409' into 'master'
Add member: Always return 409 when a member exists

Closes #20732

See merge request !9093
2017-02-13 12:00:29 +00:00
Rémy Coutable 6c62ec76c0 Merge branch '1051-api-create-users-without-password' into 'master'
Optionally make users created via the API set their password

Closes #1051

See merge request !8957
2017-02-10 18:34:58 +00:00
Jarka Kadlecova 88d610c60e Add member: Always return 409 when a member exists 2017-02-10 15:53:01 +01:00
Sean McGivern 199b17e556 Merge branch 'jej-update-mr-state-event-docs' into 'master'
Update MergeRequest API state_event option documentation

Closes #25566

See merge request !8077
2017-02-10 12:33:38 +00:00
Joost Rijneveld 6fab6d94ce
Optionally make users created via the API set their password 2017-02-09 20:32:54 +01:00
Rémy Coutable 83b21c2401 Merge branch 'patch-9' into 'master'
oauth2.md: should use the provider's URL which is gitlab.example.com

See merge request !8173
2017-02-09 17:48:29 +00:00
Rémy Coutable 8b40c9ca19 Merge branch 'fixes/namespace-api-documentation' into 'master'
Update API docs for new namespace format

Closes #27730

See merge request !9073
2017-02-09 16:11:47 +00:00
James Edwards-Jones 744df2dca8 Update MergeRequest API state_event option documentation 2017-02-09 14:23:49 +00:00
Dmitriy Zaporozhets 3d20670058 Merge branch 'dz-nested-groups-api' into 'master'
Nested groups API

See merge request !9034
2017-02-09 08:31:43 +00:00
Markus Koller 09a04107c3
Update API docs for new namespace format
Follow-up to d05dd81b which changed the nested namespaces in projects
to use API::Entities::Namespace instead of exposing all fields.

Fixes #27730
2017-02-08 21:12:13 +01:00
Douwe Maan 11d33873a8 Merge branch '23104-remove-public-param-for-projects' into 'master'
API: remove `public` param for projects

Closes #23104

See merge request !8736
2017-02-08 15:20:33 +00:00
Rémy Coutable 64331de360 Merge branch 'fix-api-delete-file-example' into 'master'
Fix the curl command for deleting files (DELETE instead of PUT)

See merge request !8245
2017-02-08 12:46:22 +00:00
Dmitriy Zaporozhets df974814fb
Add nested groups to the API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-02-08 12:42:34 +02:00
Toon Claes c6ad83ec29 API: remove `public` param for projects
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.
2017-02-07 14:29:31 +01:00
Robert Schilling 67f5522d2e Remove /projects/:id/keys/.. endpoints 2017-02-07 14:14:15 +01:00
Sean McGivern f97d7769e0 Merge branch 'api-remove-snippets-expires-at' into 'master'
Remove deprecated 'expires_at' from project snippets API

Closes #14156

See merge request !8723
2017-02-07 13:02:56 +00:00
Robert Schilling 5985b55769 Remove deprecated 'expires_at' from project snippets API 2017-02-07 12:16:00 +01:00
Rémy Coutable 853314c193 Merge branch '27643-api-sample-fix-for-file-ops' into 'master'
Rename example from file_name to file_path

Closes #27643

See merge request !8959
2017-02-06 18:00:47 +00:00
Oswaldo Ferreira c2d64d6702 Remove deprecated MR and Issue endpoints and preserve V3 namespace 2017-02-06 10:12:20 -02:00
Kamil Trzciński 999edc5c17 Merge branch 'terminal-max-session-time' into 'master'
Introduce maximum session time for terminal websocket connection

Closes #26263

See merge request !8413
2017-02-06 11:48:53 +00:00
Rémy Coutable dcf9af6c12 Merge branch '22007-unify-projects-search' into 'master'
Unify projects search by removing /projects/:search endpoint

Closes #22007

See merge request !8877
2017-02-06 11:28:48 +00:00
Adam Niedzielski 5d3816652e Introduce maximum session time for terminal websocket connection
Store the value in application settings.
Expose the value to Workhorse.
2017-02-06 11:49:30 +01:00
Achilleas Pipinellis a6ac23250a Move project services to new location under Integrations 2017-02-03 20:28:47 +01:00
Rick Gudmundson c9d307d908 Rename example from file_name to file_path
Applied in example response for create, update, and delete operations

Fixes #27643
2017-02-03 15:26:45 +00:00
Sean McGivern 25bb39225e Merge branch '24606-force-password-reset-on-next-login' into 'master'
Force new password after password reset via API

Closes #24606

See merge request !8933
2017-02-03 09:53:02 +00:00
Oswaldo Ferreira e8fd6c7e66 Update V3 to V4 docs 2017-02-02 17:41:21 -02:00
George Andrinopoulos d796e4fc37 Update api docs and minor changes 2017-02-02 17:15:02 +02:00
Dmitriy Zaporozhets bbd8d0d19b Update group api doc with full_name and full_path attributes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-01-30 17:33:49 +02:00
Mike Greiling 7e51cd32d3 update scripts and docs to reference the newly namespaced rake task 2017-01-27 15:23:09 -06:00
Marc van Gend de8eeac556 Update enviroments.md - example CURL requests had a typo in the URL 2017-01-24 23:13:30 +00:00
Rémy Coutable 4b7e8f2570 Merge branch '25851-document-token-scopes' into 'master'
Add documentation around OAuth/Personal Access Token scopes.

Closes #25851

See merge request !8226
2017-01-20 12:16:08 +00:00
Timothy Andrew 63e8dc8a76
Add documentation around OAuth/Personal Access Token scopes. 2017-01-19 14:05:06 +05:30
Ruben Davila 0f3c9355c1 Add some API endpoints for time tracking.
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"
2017-01-18 10:48:16 -06:00
David Eisner 7ef1c6408e API: Implement project issues iid param with IssuesFinder and add tests
- 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>
2017-01-12 17:51:06 -05:00
Horacio Sanson f986b4c4e5 Add support for PlantUML diagrams in Asciidoc.
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
2017-01-12 10:04:52 +00:00
Mark Fletcher b5f4fc843a Fix groups API to accept path when transferring a project
* Use standard helpers for finding group and project
2017-01-03 09:25:56 +00:00
Robert Schilling ec7485de21 Grapify the settings API 2016-12-29 11:24:15 +01:00
Douwe Maan 20afb4c69e Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'
Allow to add deploy keys with write-access

Closes #1376

See merge request !7383
2016-12-27 15:00:49 +00:00
Bruno Melli 206efcdac4 Fix the curl command for deleting files (DELETE instead of PUT) 2016-12-21 23:14:22 -07:00
Markus Koller 3ef4f74b1a
Add more storage statistics
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.
2016-12-21 16:39:49 +01:00
Rémy Coutable 5652da8bb4 Allow unauthenticated access to Repositories Files API GET endpoints
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-20 16:11:09 +01:00
Lin Jen-Shin 0f0738e788 Merge remote-tracking branch 'upstream/master' into 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
  ...
2016-12-20 20:54:40 +08:00
Rémy Coutable 2e6c1720ea Allow Repositories API GET endpoints to be requested anonymously
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-19 18:52:42 +01:00
Mehdy Khoshnoody effc6c1703 oauth2.md: should use the provider's URL which is gitlab.example.com 2016-12-19 11:33:55 +00:00
Kamil Trzciński bdb5e67718 Merge branch 'issue_22269' into 'master'
Mattermost Notifications Service

## What does this MR do?
closes #22269 

## Screenshots 

![mattermost](/uploads/de71c121f544a91305b6dfa6dc4c5738/mattermost.png)  
![slack](/uploads/081d75d49239319d94332abda214fb98/slack.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)


See merge request !7764
2016-12-16 13:23:19 +00:00
Kamil Trzciński dfdce39ad6 Merge branch '22864-add-clean-environment-name' into 'master'
Add a slug to environments

## What does this MR do?

Adds a `slug` field to the `environments` table, populating existing rows and ensuring that new rows will get an entry.

Cleaning examples:

* `review/foo`  => `review-foo-5gghdf`
* `review-foo` => `review-foo`
* `1-foo` => `env-1-foo-e2hx12`
* `production` => `production`
* `Production` => `production-f8ddlz`

## Are there points in the code the reviewer needs to double check?

This migration requires downtime. I don't see a way to avoid it.

## Why was this MR needed?

External services often have more restrictive rules on naming than those enforced for `environments.name`. In particular, forward slashes and names longer than 24 characters causes problems on OpenShift. `slug` is designed to be an acceptable alternative to `name` in these situations. Since forward slashes are a documented part of environment names, to set environment types, we need an envionmnent slug, not just a slug for the branch name.

## 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?

Part of #22864

See merge request !7983
2016-12-15 16:18:50 +00:00
Nick Thomas 93a03cd92f Add an environment slug 2016-12-15 13:57:03 +00:00
Felipe Artur 141faaacf9 Mattermost Notifications Service 2016-12-15 11:09:31 -02:00
Robert Schilling 8b83d84bbd Remove duplicated parameter description [ci skip] 2016-12-15 10:30:40 +01:00
Rémy Coutable 632450a4bd Merge branch 'api-cherry-pick' into 'master'
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
2016-12-13 19:23:34 +00:00
Robert Schilling 1a81fcfbd8 API: Ability to cherry-pick a commit 2016-12-13 16:12:40 +01:00
Robert Schilling 7841be243e API: Ability to get group's project in simple representation 2016-12-13 13:54:36 +01:00
Rémy Coutable 927a75567a Merge branch 'grapify-service-api' into 'master'
Grapify the service API

Related to #22928 

See merge request !7970
2016-12-12 17:54:00 +00:00
Filipa Lacerda eb839b9af5 Merge CSS 2016-12-12 17:52:06 +00:00
Robert Schilling 8d0645c2ce Grapify the service API 2016-12-12 14:27:52 +01:00
Sean McGivern 87f3a66c32 Merge branch 'features/api-snippets' into 'master'
Adding support for personal snippet endpoint on the API

Closes #22042

See merge request !6373
2016-12-12 08:58:13 +00:00
Georg Hartmann 36c24de5da Fix typo in curl example request 2016-12-11 19:36:01 +00:00
Robert Schilling 593c912151 Grapify the service API 2016-12-09 17:20:12 +01:00
Rémy Coutable 192d40e53e Merge branch 'api-remove-source-branch' into 'master'
API: Ability to remove source branch

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23577

See merge request !7804
2016-12-09 13:39:53 +00:00
Douwe Maan 50a784482e Merge branch 'public-tags-api' into 'master'
Allow public access to some Tag API endpoints

Continuation of #4269.

See merge request !7896
2016-12-08 01:02:17 +00:00
Douwe Maan cf2206eb2b Merge branch '24537-reenable-private-token-with-sudo' into 'master'
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
2016-12-08 00:17:44 +00:00
Rémy Coutable f90d92e335 Merge branch '24565-fix-api-example-typos' into 'master'
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
2016-12-07 16:26:57 +00:00
tiagonbotelho 3ed96afc47 adds impersonator variable and makes sudo usage overall more clear 2016-12-07 14:42:51 +00:00
Rémy Coutable 9e307b93b7
Allow public access to some Tag API endpoints
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-07 11:39:11 +01:00
Sean McGivern d9ef41cf4d Merge branch '23589-open-issue-for-mr' into 'master'
Create an issue for all unresolved discussions in an MR

See merge request !7180
2016-12-06 14:04:14 +00:00
Lin Jen-Shin d6287ab230 Merge remote-tracking branch 'upstream/master' into 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
  ...
2016-12-06 20:53:07 +08:00
Douwe Maan f0f514ac25 Merge branch 'document-public-project-api' into 'master'
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
2016-12-06 00:53:19 +00:00
Bob Van Landuyt 1123057ab7 Feature: delegate all open discussions to Issue
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.
2016-12-05 20:55:45 +01:00
Kamil Trzciński 0f90fd639c Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master'
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
2016-12-05 11:07:57 +00:00
Robert Schilling 8b5c16e4b1 API: Ability to remove source branch 2016-12-04 16:52:42 +01:00
Rémy Coutable d74801ac6f
Document the public Project API and document `GET /projects/:id/users`
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-02 14:34:17 +01:00
Guyzmo fde754e267 API: Endpoint to expose personal snippets as /snippets
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>
2016-12-01 19:07:49 +01:00
Robert Schilling 79d99d470f API: Expose committer details for a commit 2016-12-01 11:10:46 +01:00
Rémy Coutable 467b44cbbf Merge branch 'api-branch-status' into 'master'
API: Expose branch status

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938

See merge request !7796
2016-11-30 17:40:39 +00:00
Rémy Coutable 2c0d9890e6 Merge branch 'grapify-files-api' into 'master'
Grapify the files API

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928

See merge request !7806
2016-11-30 15:10:56 +00:00
Robert Schilling 2ce66c071f API: Expose branch status 2016-11-30 13:13:50 +01:00
Robert Schilling dd5f71138c Grapify the files API 2016-11-30 12:48:10 +01:00
Grzegorz Bizon 00ca7adca2 Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds
* 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
2016-11-30 12:21:33 +01:00
Robert Schilling 7c607a55ab Grapify the projects API 2016-11-28 21:01:43 +01:00
Rémy Coutable e17328986a Merge branch 'zj-expose-coverage-pipelines' into 'master'
Expose coverage on GET pipelines/:id

Closes gitlab-org/gitlab-ce#24801

See merge request !7670
2016-11-25 16:51:53 +00:00
Z.J. van de Weg 752d72f876 Add docs for pipeline coverage
[ci skip]
2016-11-25 17:39:00 +01:00
Rémy Coutable d03ca3d02e Merge branch 'issue-24534' into 'master'
Remove unnecessary sentences for return codes in the API documentation

Closes #24534

See merge request !7511
2016-11-25 15:43:05 +00:00
Grzegorz Bizon 895d97af87 Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds
* 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
2016-11-25 11:05:34 +01:00
Robert Speicher fe4ae12ec8 Merge branch 'rephrase-system-notes' into 'master'
Rephrase some system notes to be compatible with new system note style

See merge request !7692
2016-11-25 04:36:13 +00:00
Luis Alonso Chavez Armendariz ed61d44e1e Remove unnecessary sentences for status codes in the API documentation 2016-11-24 10:28:52 -07:00