e95b88a06d
Revert "Merge branch 'filter-confidential-issues' into 'master'"
...
This reverts commit d133bf84c67981c0292b
2019-02-25 12:42:34 -08:00
0b0a04fdf7
Merge branch 'zj-load-languages-from-database' into 'master'
...
Load repository language from the DB if detected
Closes #47390
See merge request gitlab-org/gitlab-ce!25518
2019-02-25 16:41:04 +00:00
5a0629b483
Merge branch '58020-fix-merge-api-endpoint-param' into 'master'
...
Respect the `should_remove_source_branch` parameter to the merge API
Closes #58020
See merge request gitlab-org/gitlab-ce!25525
2019-02-25 15:47:35 +00:00
abe8cbe90b
Load repository language from the DB if detected
...
The repository charts page used to detect the repository language for
each request that was made to the page. Given the detection is an
expensive operation and the same data is stored in the database the
database is now serving the request.
The same goes for an API endpoint that serves the languages.
When a repository is empty or non-existent the languages will always be
empty. And the language detection RPC isn't requested.
Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/47390
2019-02-25 15:15:16 +01:00
c85a768ca5
Respect the should_remove_source_branch parameter to the merge API
2019-02-25 14:09:48 +00:00
c6b9ac860c
Merge branch 'expose-merge-ref-to-runner' into 'master'
...
Expose refspec and depth to runner
See merge request gitlab-org/gitlab-ce!25233
2019-02-25 11:36:30 +00:00
8cb236908f
Merge branch '40795-set-project-name-on-fork-api' into 'master'
...
Add ability to set project path and name on fork using API
Closes #40795
See merge request gitlab-org/gitlab-ce!25363
2019-02-25 11:24:13 +00:00
d133bf84c6
Merge branch 'filter-confidential-issues' into 'master'
...
Ability to filter confidential issues
Closes #50747
See merge request gitlab-org/gitlab-ce!24960
2019-02-25 11:00:24 +00:00
7981c0292b
Merge branch '49449-add-an-api-endpoint-for-bulk-updating-issues-and-mrs' into 'master'
...
API endpoint for bulk updating issues and MRs
Closes #49449
See merge request gitlab-org/gitlab-ce!25201
2019-02-25 10:51:58 +00:00
4b282e9ce1
Merge branch 'sh-fix-cpp-templates-404' into 'master'
...
Fix 404s when C++ .gitignore template selected
Closes #57857
See merge request gitlab-org/gitlab-ce!25416
2019-02-25 10:41:50 +00:00
7ba89e4ac4
Expose refspec and depth to runner
...
fix
fix and fix
Allow full ref specification for pipeline creation
Add spec
Support backward compatibility
Use ref path
Runner feature flag
Simplify the things
Support fork workflow (Public only)
Expose ref spec
Use refspec
Glooming
Decouple unrelated changes
Add changelog
Revert unrelated file
Decouple unnecessary
Add spec
Use refspecs
Fix changelog
Simplify
Fix coding offence
Fix
a
ok
ok
ok
ok
ok
a
a
Fix
Add workaround for ignore_column
Fix git depth
Fix coding offence
Fix spec
Simplify more
Do not set ignored column
Fix tests
Fix pipeline
Fix spec
fix fixture yes
Revert nonsense
fix
Revert more
ok
Decouple mr pipelines
fix spev
Remove unrelated changes
2019-02-25 13:40:15 +09:00
d03b7bb1e0
Properly handle multiple X-Forwarded-For addresses in runner IP
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24624 extracted
the X-Forwarded-For address directly, but this didn't consider the case
where multiple proxies are in the chain. To fix this, we use the Rails
implementation to filter trusted proxies, as documented by Grape:
https://github.com/ruby-grape/grape#remote-ip
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58103
2019-02-24 14:50:55 -08:00
d2c2a0627f
Fix 404s when C++ .gitignore template selected
...
Due to a overly-stringent regex, the project template API was 404'ing
when C++ was requested as the template. Loosen the regex to allow `+`
and `%` for URL-encoded characters.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57857
2019-02-22 00:05:19 -08:00
73e3a1cd02
Add API support for filtering confidential issues
2019-02-21 14:02:38 +01:00
99633a8fa3
Add specs: setting path/name to project fork API
2019-02-20 00:19:28 +05:30
cccf611509
Merge branch '55376-related_merge_requests-api-call-returns-merge-requests-that-are-not-related-to-the-issue' into 'master'
...
Ensure that related_merge_requests api call returns merge requests in the correct scope
Closes #55376
See merge request gitlab-org/gitlab-ce!25222
2019-02-19 12:05:26 +00:00
4235620170
Add related merge request count to api response
2019-02-19 11:30:07 +00:00
2f768281b8
Merge branch '54796-add-tiebreaker-to-sorts' into 'master'
...
Added: Include order by ID desc as tie break in pagination
Closes #54796
See merge request gitlab-org/gitlab-ce!25311
2019-02-19 11:18:54 +00:00
3dca5b3076
Add changelog and updated spec
...
Ensure that references to private projects are not visible
2019-02-19 12:13:22 +01:00
5ff775fdef
Merge branch 'jej/feature-gates-can-be-set-by-group-path' into 'master'
...
Allow setting feature flags per GitLab group
See merge request gitlab-org/gitlab-ce!25022
2019-02-19 07:50:55 +00:00
46f66c7f0a
Allow setting feature flags per GitLab group
...
Building on support for setting feature flags by project, this adds
support for setting them by GitLab group path.
This is different from setting them by Flipper feature_groups, which
are for batch updating pre-registered collections.
2019-02-19 14:57:03 +08:00
64ed7069c7
Incorporate review feedback
...
Use shared examples for issues and merge requests
rather than a loop creating common specs.
2019-02-18 14:38:14 +01:00
2c15cf471d
Include gl_project_path in API /internal/allowed response
...
This will enable us to track the human-readable project path with SSH
access in gitlab-shell. Currently the Gitaly logs will only show the
hashed storage and gl_repository path (e.g. project-1234).
2019-02-16 06:57:28 -08:00
44b2d759b2
Added: Specs to cover other endpoints for the same reason
2019-02-16 14:57:12 +01:00
c8352c9fcc
Added: Specs for issues index
2019-02-16 14:40:26 +01:00
c34c50e1b8
Merge branch '57353-git-push-fails-on-large-lfs-files-where-the-push-take-a-long-time' into 'master'
...
Provide expires_in in LFS authentication payload
Closes #57353
See merge request gitlab-org/gitlab-ce!25082
2019-02-15 13:15:55 +00:00
0328d4faee
Merge branch '56485-implement-graphql-mergerequestsresolver' into 'master'
...
Resolve "Implement GraphQL MergeRequestsResolver"
Closes #56485
See merge request gitlab-org/gitlab-ce!24805
2019-02-15 08:47:10 +00:00
d9328cb3e3
Merge branch '49502-gpg-signature-api-endpoint' into 'master'
...
Provide an API endpoint to get the GPG signature of a commit
Closes #49502
See merge request gitlab-org/gitlab-ce!25032
2019-02-15 01:59:39 +00:00
1cfa3c76a1
Include expires_in for LFS authentication payload
...
When using git-lfs with SSH we weren't passing in
the expires_header header which is allows large
transfers to succeed in the event the current
default of 30 mins expires.
https://github.com/git-lfs/git-lfs/blob/master/docs/api/server-discovery.md#ssh
2019-02-15 09:29:52 +11:00
6b2673bc7a
Add new to test bulk_update endpoint for issues and MRs
...
Add documentation for issues and MRs. Add shared tests
for both bulk updating issues and MRs.
2019-02-14 23:14:23 +01:00
6e4fdc117c
Directly use MRs given by ReferencedMergeRequestsService
2019-02-14 23:11:06 +01:00
cd6af77f95
API: Expose if the user can merge a given merge request
2019-02-14 16:32:44 +00:00
f80f6bbcdc
Use a block and move setup to example directly
2019-02-14 22:57:34 +08:00
ed7144ad58
Merge branch '56694-mark-group-level-labels-in-label-api-as-such' into 'master'
...
Mark group-level labels in Label API as such.
Closes #56694
See merge request gitlab-org/gitlab-ce!25219
2019-02-14 10:48:12 +00:00
50491d3241
Instead of returning all or nothing, return whichever passed
...
And add tests
2019-02-14 15:52:17 +08:00
e9c3c3bf31
Add specs for commit's GPG signature API endpoint
2019-02-14 11:29:42 +05:30
feb2cb9085
API: Reference MRs cross-project wise
2019-02-13 23:13:45 +01:00
cc8b8ec08f
Add docs and specs
2019-02-13 22:16:40 +01:00
5b29f06611
Only require one parameter when updating a Wiki via the API
2019-02-13 16:35:27 +00:00
314c99e36c
API: Expose full commit title
2019-02-13 14:34:20 +00:00
2a5ca841c4
API: Expose text_color for project and group labels
2019-02-12 19:36:45 +01:00
05033177d7
Merge branch 'local-markdown-version' into 'master'
...
Add local markdown version
Closes #32789
See merge request gitlab-org/gitlab-ce!24822
2019-02-07 12:58:38 +00:00
7d37e345b5
Merge branch '56014-api-merge-request-squash-commit-messages' into 'master'
...
API support for setting squash commit message during squash
Closes #56014
See merge request gitlab-org/gitlab-ce!24784
2019-02-07 12:28:56 +00:00
d91b96458e
Merge branch 'api-group-labels' into 'master'
...
API group labels
Closes #44901
See merge request gitlab-org/gitlab-ce!21368
2019-02-07 09:48:04 +00:00
b37266004c
API support for squash commit message during merge
...
Issues
https://gitlab.com/gitlab-org/gitlab-ce/issues/47149
https://gitlab.com/gitlab-org/gitlab-ce/issues/56014
2019-02-07 10:05:54 +13:00
433bcf9b04
Add local markdown version
...
Cached markdown version is composed both from global and local
markdown version. This allows admins to bump version locally when
needed (e.g. when external URL is changed).
2019-02-06 19:46:59 +01:00
b6a437313d
Merge branch 'security-makrdown-release-description-vulnerability' into 'master'
...
[master] Markdown of release notes leaks confidential issue titles and MR titles to any users
See merge request gitlab/gitlabhq!2869
2019-02-06 12:03:21 +00:00
f04910f254
Merge branch 'sh-encode-content-disposition' into 'master'
...
Encode Content-Disposition filenames
Closes #47673
See merge request gitlab-org/gitlab-ce!24919
2019-02-05 13:36:43 +00:00
068b41275f
Merge branch 'search-title' into 'master'
...
Add 'in' filter that modifies scope of 'search' filter to issues and merge requests API
See merge request gitlab-org/gitlab-ce!24350
2019-02-05 09:52:40 +00:00
41b51c0656
Encode Content-Disposition filenames
...
Users downloading non-ASCII attachments would see garbled characters.
When used with object storage, AWS S3 would return an InvalidArgument
error: Header value cannot be represented using ISO-8859-1.
Per RFC 5987 and RFC 6266, Content-Disposition should be encoded
properly. This commit takes the Rails 6 implementation of
ActiveSuppport::Http::ContentDisposition
(https://github.com/rails/rails/pull/33829 ) and ports it here.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47673
2019-02-04 23:12:44 -08:00
Michael Kozono
Nick Thomas
Lin Jen-Shin
Zeger-Jan van de Weg
Kamil Trzciński
Douwe Maan
Rémy Coutable
Shinya Maeda
Stan Hu
Robert Schilling
Balasankar "Balu" C
Sean McGivern
Patrick Derichs
James Lopez
James Edwards-Jones
Nermin Vehabovic
Douglas Barbosa Alexandre
Ash McKenzie
Robert Schilling
Luke Duncalfe
Jan Provaznik
Yorick Peterse