52bfd06462
Use relative git object paths to construct absolute ones before setting Env
2017-11-14 20:26:39 +01:00
6b01821b0d
Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'
...
Do not allow jobs to be erased
Closes #31771
See merge request gitlab-org/gitlab-ce!15216
2017-11-14 10:54:30 +00:00
1162d89ac4
Add administrative endpoint to list all pages domains
2017-11-13 16:05:44 +00:00
258bf3e187
Add Gitlab::Utils::StrongMemoize
2017-11-13 15:27:30 +00:00
26b6dfaf6f
Add /groups/:id/subgroups endpoint to API
2017-11-09 16:07:04 +00:00
ae434cccb2
Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master'
...
Fix acceptance of username for Mattermost service update
Closes #39895
See merge request gitlab-org/gitlab-ce!15275
2017-11-09 13:19:27 +00:00
20ac30a705
Merge branch '36099-api-responses-missing-x-content-type-options-header' into '10-1-stable'
...
Include X-Content-Type-Options (XCTO) header into API responses
See merge request gitlab/gitlabhq!2211
(cherry picked from commit 6c818e77f2e087e075
2017-11-08 20:11:18 -08:00
12d622eb99
Fix acceptance of username for Mattermost service update via API
2017-11-08 19:48:19 +00:00
0c3877a488
Merge branch 'fix-issues-api-list-performance' into 'master'
...
Fail when issuable_meta_data is called on an unlimited collection
Closes #39845
See merge request gitlab-org/gitlab-ce!15249
2017-11-08 19:37:21 +00:00
fec48c6e17
Use Commit#notes and Note.for_commit_id when possible to make sure we use all the indexes available to us
2017-11-08 12:22:11 +01:00
4d4ddb6004
Fail when issuable_meta_data is called on an unlimited collection
...
This method can be called with an array, or a relation:
1. Arrays always have a limited amount of values, so that's fine.
2. If the relation does not have a limit value applied, then we will load every
single object in that collection, and prevent N+1 queries for the metadata
for that. But that's wrong, because we should never call this without an
explicit limit set. So we raise in that case, and this commit will see which
specs fail.
The only failing specs here were the issues API specs, and the specs for
IssuableMetadata itself, and both have been addressed.
2017-11-07 16:26:55 +00:00
d89c18901b
Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new
2017-11-07 22:12:19 +09:00
8138d58d42
Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request' into 'master'
...
Fetch the merged branches at once in the `/projects/:id/repository/branches` endpoint
See merge request gitlab-org/gitlab-ce!15215
2017-11-07 11:09:00 +00:00
31e3ef93e5
Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'
...
Support custom attributes on groups and projects
See merge request gitlab-org/gitlab-ce!14593
2017-11-07 10:59:38 +00:00
2ec5ae21b8
Merge branch 'add-changes-count-to-merge-requests-api' into 'master'
...
Add changes_count to the merge requests API
See merge request gitlab-org/gitlab-ce!15178
2017-11-07 10:58:03 +00:00
afef385337
Add doc. Fix spec. Add erase_build in protected_ref rule
2017-11-07 02:47:05 +09:00
e78c701aff
Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-06 16:29:50 +01:00
c8eb2a914b
Fix spec. Revert update check.
2017-11-06 23:24:25 +09:00
9b58b8e363
Do not allow jobs to be erased
2017-11-06 22:20:44 +09:00
b20984dea2
Improve performance of the /projects/:id/repository/branches API endpoint
...
Mitigate a N+1 requests to Gitaly problem. Still one left.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-06 13:31:23 +01:00
1f773a8ef5
Support custom attributes on groups
2017-11-06 10:51:50 +01:00
6902848a9c
Support custom attributes on projects
2017-11-06 10:51:46 +01:00
08bc2f946b
Expose `duration` in Job API entity
...
Closes #35794 .
2017-11-05 21:59:58 +01:00
9d259c2232
Add changes_count to the merge requests API
...
This returns the `real_size` of the MR's diff, which is a string indicating the
number of changes. If the diff overflows after _n_ files, the string will be
`$n+`.
2017-11-03 14:28:18 +00:00
b7c8f7d76d
Update specs for sudo behavior
2017-11-02 11:39:03 +01:00
3f24f9ed18
Add sudo API scope
2017-11-02 11:39:03 +01:00
294fa6fcdc
Remove authentication using user.private_token
2017-11-02 11:39:02 +01:00
fbdf057898
Remove private_token from API user entity
2017-11-02 11:39:01 +01:00
a72d687931
Remove Session API
2017-11-02 11:39:01 +01:00
19bf710354
Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' into 'master'
...
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
Closes #39619
See merge request gitlab-org/gitlab-ce!15088
2017-10-31 11:58:38 +00:00
e829d5a084
Merge branch 'add-packagist-project-service' into 'master'
...
Add Packagist project service
See merge request gitlab-org/gitlab-ce!14493
2017-10-31 11:54:49 +00:00
ff1e3a47c4
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
2017-10-30 17:19:51 +00:00
c29d2c6a41
Merge branch 'api-configure-jira' into 'master'
...
Validate username/pw for Jiraservice, require them in the API
Closes #36621
See merge request gitlab-org/gitlab-ce!15025
2017-10-26 11:20:48 +00:00
cc5ba3d907
Validate username/pw for Jiraservice, require them in the API
2017-10-24 10:35:21 +03:00
8d1ab256bf
Add pages domains API implementation
2017-10-22 08:04:43 -05:00
bcccf6c161
Add pages domains API entities
2017-10-22 08:04:42 -05:00
220a5c3759
Merge branch '37032-get-project-branch-invalid-name-message' into 'master'
...
Get Project Branch API shows an helpful error message on invalid refname
Closes #37032
See merge request gitlab-org/gitlab-ce!14884
2017-10-18 10:38:16 +00:00
26ec874f77
Get Project Branch API shows an helpful error message on invalid refname
...
In API v4 when requesting a branch with an invalid refname shows an
helpful error message: 'The branch refname is invalid'.
2017-10-18 09:45:27 +02:00
38ff8cd13d
Merge branch 'sha-handling' into 'master'
...
Adds requirements that supports anything in sha params
Closes #26561 and #2709
See merge request gitlab-org/gitlab-ce!14462
2017-10-16 15:14:42 +00:00
c207122fd2
Add Packagist project service
2017-10-13 13:42:53 -04:00
9fdde3693b
Move line code generation into Gitlab::Git
...
Having a distinct class just for that was a bit overkill
2017-10-12 22:13:05 -03:00
faa9bd402d
Create a Gitlab::Git submodule for conlict-related files
...
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
f72598b659
Move Gitlab::Diff::LineCode to module Gitlab::Git
2017-10-12 21:45:16 -03:00
771b777ab5
Adds requirements that supports anything in sha params
2017-10-12 18:46:41 -03:00
025c6eeaa1
Move all API authentication code to APIGuard
2017-10-12 11:13:37 +02:00
a68a39e341
Merge branch '18608-lock-issues-v2' into 'master'
...
Resolve "Lock issue and merge request"
Closes #18608
See merge request gitlab-org/gitlab-ce!14531
2017-10-06 16:47:27 +00:00
7f8e720f41
Merge branch 'api-sentry-extra' into 'master'
...
Send API parameters as extra data for sentry errors
See merge request gitlab-org/gitlab-ce!14644
2017-10-06 13:41:01 +00:00
60a35e4230
Send API parameters as extra data for sentry errors
2017-10-05 18:31:34 -03:00
0c0c2ecd99
Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
...
# Conflicts:
# app/controllers/admin/users_controller.rb
# app/controllers/confirmations_controller.rb
# app/controllers/profiles/emails_controller.rb
# app/models/user.rb
# app/services/emails/base_service.rb
# app/services/emails/destroy_service.rb
# app/views/devise/mailer/confirmation_instructions.html.haml
# lib/api/users.rb
# spec/services/emails/destroy_service_spec.rb
2017-10-05 12:48:22 +02:00
c55a9ac4ae
Remove 'Repo' prefix from API entites
2017-10-05 19:48:05 +11:00
Ahmad Sherif
Kamil Trzciński
Travis Miller
Lin Jen-Shin (godfat)
Winnie Hellmann
Rémy Coutable
Douwe Maan
Mark Fletcher
Stan Hu
Douwe Maan
Sean McGivern
Shinya Maeda
Markus Koller
Mehdi Lahmam
Robert Schilling
Jacopo
Matt Coleman
Alejandro Rodríguez
Guilherme Vieira
Sean McGivern
Vitaliy @blackst0ne Klachkov