ae7b2ef62c
Merge branch 'master' into issue_12658
...
# Conflicts:
# app/models/issue.rb
# app/views/projects/_home_panel.html.haml
# app/views/shared/projects/_project.html.haml
# db/schema.rb
# spec/models/project_spec.rb
2016-03-21 23:22:21 +01:00
d28a587e82
Fix typos and denting
2016-03-21 19:30:45 +01:00
3b088fc5b5
Minor improvements on IssuableActions
2016-03-21 16:59:35 +01:00
8db1292139
Tweaks, refactoring, and specs
2016-03-20 21:04:07 +01:00
7342a4566c
Dry destroy action on issuables
2016-03-19 21:24:05 +01:00
212e83bab3
Soft delete issuables
2016-03-19 21:23:03 +01:00
956e914307
Add missing API docs on external user
...
[ci skip]
2016-03-17 12:21:12 +02:00
59064aeeef
Merge branch 'master' into 4009-external-users
2016-03-15 19:16:16 +01:00
aaf4434b0e
Doc external users feature
2016-03-15 18:50:58 +01:00
c4b35a6230
Merge branch 'fix-commit-status-rendering' into 'master'
...
Cleanup Ci::Commit, Ci::Build and CommitStatus views
This MR tries to do first sweep of cleanups to Ci::Commit and
Ci::Build objects removing all view-related functions and fixing the
API from other side.
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046
See merge request !2760
2016-03-15 00:51:43 +00:00
d324bf8434
Merge branch 'share-project-ce' into 'master'
...
Bring from EE: Share Project with Group
- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
For #12831
cc @DouweM @rspeicher @vsizov
See merge request !3186
2016-03-14 16:38:52 +00:00
0672258915
Cleanup CiCommit and CiBuild
...
- Remove all view related methods from Ci::Build and CommitStatus
- Remove unused Ci::Commit and Ci::Build methods
- Use polymorphism to render different types of CommitStatus
2016-03-14 13:20:35 +01:00
e8b3b92dde
Bring share project with group API from EE
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-13 11:52:43 +01:00
befa7a9c17
Don't remove `ProjectSnippet#expires_at` from API
...
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103
This partially reverts commit 836d593033
2016-03-09 16:56:42 -05:00
bc14d81af0
Merge branch 'rs-snippets-dont-expire' into 'master'
...
Remove `Snippet#expires_at`
This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.
See merge request !3103
2016-03-09 09:02:17 +00:00
fe9a445faa
Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master'
...
Expose User#last_sign_in_at and User#confirmed_at for admins
Closes #840
See merge request !3090
2016-03-08 17:30:10 +00:00
a19a9faba9
Merge branch 'doc/ci-api-update' into 'master'
...
Deprecated GitLab CI API clean up
Deprecated GitLab CI API clean up.
The intent here is to clean up deprecated GitLab CI documentation leaving only relevant information.
Since we merged `Ci::Project` to `Project` most of this documentation is outdated.
Closes #13610
See merge request !3003
2016-03-08 09:35:10 +00:00
836d593033
Remove `Snippet#expires_at`
...
This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.
2016-03-05 18:12:17 -05:00
b0d24ab1b5
Add fields to GET /users/* API endpoints for admins
...
Added fields are last_sign_in_at and confirmed_at.
They are available for GET /users/ and GET /users/:id for admins.
Closes #840
2016-03-04 11:59:43 +01:00
2af778c4fa
typo
2016-03-02 09:42:14 +00:00
ec7c6a084c
Remove deprecated CI API docs for commits and projects
...
[ci skip]
2016-02-29 13:22:34 +01:00
13fd08b157
Add when the API changes got introduced
...
[ci skip]
2016-02-22 14:30:22 +02:00
ad833c934b
Fix docs on artifacts API
...
- Backticks in parameters
- Remove headings
- Fix curl URL link
[ci skip]
2016-02-20 14:13:21 +02:00
17182cdfe0
Fix documentation
2016-02-19 20:56:56 +01:00
6c6bb79422
Fix API
2016-02-19 18:30:43 +01:00
921cfb66e6
Introduce API for serving the artifacts archive
2016-02-19 18:30:13 +01:00
7d5a182624
Use POST method instead of DELETE when erasing a build
...
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042
2016-02-19 17:24:59 +01:00
ec5c3c029c
Add API documentation for build erase endpoint
2016-02-19 17:24:59 +01:00
e4d2f9972c
Change `last_contact` to `contacted_at`
2016-02-19 13:18:49 +01:00
7ea60c8564
Replace Entities::RunnerProjectDetails with Entities::ForkedFromProject
2016-02-19 13:18:49 +01:00
4ebadb77dd
iChange `name` and `path` to `name_with_namespace` and `path_with_namespace` in `RunnerProjectDetails`
2016-02-19 13:18:48 +01:00
05e7335664
Update docummentation - specific runner enabling
...
[ci skip]
2016-02-19 13:18:48 +01:00
d1ac00aea3
Modify and fix output of delete and update of a runner
2016-02-19 13:18:48 +01:00
97c88966bb
GET /runners is for specific runners only
...
[ci skip]
2016-02-19 13:18:47 +01:00
553bac57d0
Add token to runner details output in API
2016-02-19 13:18:47 +01:00
dc32af9508
More fixes in runners doc
...
[ci skip]
2016-02-19 13:18:47 +01:00
a09ae17337
Correct PRIVATE-TOKEN to use dash instead of underscore
2016-02-19 13:18:47 +01:00
f562a477f2
Add associated project info to runner details output
2016-02-19 13:18:47 +01:00
81ced6f55b
Split `/runners` entrypoint to `/runners` and `/runners/all`
2016-02-19 13:18:47 +01:00
b56ee397bb
Add some fixes in runners API documentation
2016-02-19 13:18:46 +01:00
cd62c74700
Add `Example response` above each json output
...
[ci skip]
2016-02-19 13:18:46 +01:00
43c8daf3dc
Add runners API documentation [ci-skip]
2016-02-19 13:18:46 +01:00
324e6743cf
Fix typo in doc/api/builds.md
...
[ci skip]
2016-02-12 11:25:20 +02:00
0807bd5130
Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'master'
...
API: Allow to set or update a merge-request's milestone
_Originally opened at !2107 by @ skakirill._
- - -
See merge request !2755
2016-02-12 08:39:18 +00:00
973a7d040e
Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' into 'master'
...
Add merge_requests/:merge_request_id/closes_issues
_Originally opened at !2660 by @Schniz._
- - -
Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully
See merge request !2779
2016-02-11 17:13:36 +00:00
78e36780be
Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' route in the API
...
Added some documentation for it
Added to changelog
Added curl example and an attribute table
Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb"
Fixed the attributes and changed the documentation to be at "merge_requests.md" too
Changed generic titles to more specific titles
added an underscore
added tests. it depends on a newer version of gitlab-test project
I'm doing a since I need to add a branch to the `gitlab-test` repo
removed the before
using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass
Removed the 'closes-issues' key from test_env. so it should pass the tests
Moved the two initializations to the describe block
Changed the changelog
2016-02-11 09:34:07 +01:00
ba1f6de8a5
Add some fixes
...
[ci skip]
2016-02-10 15:07:11 +01:00
efedf983a1
Fix builds API formatting
...
[ci skip]
2016-02-10 14:36:51 +01:00
7ea60fbfc8
Merge remote-tracking branch 'dev/master' into 'master'
2016-02-09 12:13:58 -05:00
f6a666bdc2
Add an API spec for MergeRequest#merge_status and properly document this resource
2016-02-08 17:18:44 +01:00
Douwe Maan
Zeger-Jan van de Weg
Achilleas Pipinellis
Robert Speicher
Dmitriy Zaporozhets
Kamil Trzcinski
Robert Speicher
evuez
bb-froggy
Grzegorz Bizon
Tomasz Maczukin
Douwe Maan
Rémy Coutable
Gal Schlezinger