664cd27faa
Merge branch '38571-fix-exception-in-raven-report' into 'master'
...
Ensure no exception is raised when Raven tries to get the current user in API context
Closes #38571
See merge request gitlab-org/gitlab-ce!14580
2017-10-02 08:35:12 +00:00
01ce58bde4
add username to authorized result, so that gitlab-shell can pass it to hooks
2017-09-29 18:16:55 -04:00
3040b994df
Ensure no exception is raised when Raven tries to get the current user in API context
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-09-29 18:57:22 +02:00
e9eae3eb0d
Support custom attributes on users
2017-09-28 16:49:42 +00:00
3209c07140
Merge branch 'dm-api-unauthorized' into 'master'
...
Make sure API responds with 401 when invalid authentication info is provided
Closes #38438
See merge request gitlab-org/gitlab-ce!14525
2017-09-28 14:42:40 +00:00
b6c5a73c0b
Make sure API responds with 401 when invalid authentication info is provided
2017-09-28 14:17:52 +02:00
1dcb711110
refactor emails service
2017-09-28 08:46:39 +02:00
67d06dee30
refactor users update service
2017-09-28 08:46:39 +02:00
9621dd0c9d
refactor services to match EE signature
2017-09-28 08:46:39 +02:00
da7353d36c
Merge branch '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master'
...
find_user users helper method no longer overrides find_user API helper method.
Closes #37467
See merge request gitlab-org/gitlab-ce!14418
2017-09-27 11:29:57 +00:00
d70b7a490d
find_user users helper method no longer overrides find_user API helper method.
2017-09-26 19:14:19 +01:00
6d1498ab4e
Merge branch 'dm-simple-project-avatar-url' into 'master'
...
Expose avatar_url when requesting list of projects from API with simple=true
See merge request gitlab-org/gitlab-ce!14498
2017-09-26 14:28:38 +00:00
f696b04cc8
Expose last pipeline details in API response when getting a single commit
...
Closes #35692 .
2017-09-26 13:08:46 +02:00
a019369409
Expose avatar_url when requesting list of projects from API with simple=true
2017-09-26 12:47:48 +02:00
d247841b48
Merge branch '20049-projects-api-forks' into 'master'
...
Resolve "make project data via API report forks of this project"
Closes #20049
See merge request gitlab-org/gitlab-ce!14355
2017-09-20 09:51:00 +00:00
63e0a42317
Add an API endpoint to determine the forks of a project
2017-09-20 08:27:16 +10:00
64d7ec0a9e
Detect n+1 issues involving Gitaly
2017-09-19 10:55:37 +00:00
ff4e81e0ae
fix #35290 Make read-only API for public merge requests available without authentication
2017-09-18 17:29:17 +00:00
8d568fe324
Merge branch 'add_closed_at_attribute' into 'master'
...
Add 'closed_at' attribute to Issues API
Closes #5935
See merge request gitlab-org/gitlab-ce!14316
2017-09-18 16:37:02 +00:00
c0845e837d
Add 'closed_at' attribute to Issues API
2017-09-16 20:51:02 +11:00
3cbaed97f1
Ensure we use `Entities::User` for non-admin `users/:id` API requests
2017-09-15 19:34:52 -04:00
33010da28b
Merge branch 'sh-exclude-api-responses' into 'master'
...
Exclude logging of API responses to prevent leakage of confidential data
See merge request !14245
2017-09-13 14:24:29 +00:00
b60cebb931
Exclude logging of API responses to prevent leakage of confidential data
2017-09-13 01:25:33 -07:00
b097d065c5
Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'
...
Resolve "Move `lib/ci` to `lib/gitlab/ci`"
Closes #5836
See merge request !14078
2017-09-13 07:21:41 +00:00
c45ace8972
move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`
2017-09-12 22:32:02 +03:00
9b177bb7c9
Revert "Merge branch 'revert-f2421b2b' into 'master'"
...
This reverts merge request !14148
2017-09-11 15:44:42 +00:00
52a2423e37
Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'"
...
This reverts merge request !13619
2017-09-08 14:48:44 +00:00
62bb6235c2
Make Members with Owner and Master roles always able to create subgroups
2017-09-07 13:47:58 -05:00
7e19b5bfb6
Merge branch 'sh-add-grape-logging' into 'master'
...
Add JSON logger in `log/api_json.log` for Grape API endpoints
Closes #36189
See merge request !14102
2017-09-07 17:39:14 +00:00
523a1c69ab
Merge branch '23079-remove-default-scope-in-sortable' into 'master'
...
Removes default scope from sortable
Closes #23079
See merge request !13558
2017-09-07 16:15:32 +00:00
f2421b2b97
Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'
...
Add option to change navigation color palette
Closes #35012
See merge request !13619
2017-09-07 15:56:00 +00:00
4ae8e20c9c
Merge branch 'events-migration-cleanup' into 'master'
...
Finish migration to the new events setup
Closes #37241
See merge request !13932
2017-09-07 15:33:54 +00:00
35dec2c3e8
Use a custom GrapeLogging formatter to get the timestamp
2017-09-07 07:48:13 -07:00
c304dfd4d6
Fix Rubocop failures in API logger
2017-09-07 07:02:46 -07:00
cfd475a45e
Removes default scope from sortable
2017-09-07 13:01:59 +01:00
8ed0a05107
Merge branch 'wiki_api' into 'master'
...
Add API support for wiki pages
Closes #12747
See merge request !13372
2017-09-07 10:38:03 +00:00
f7c8032e09
Add JSON logger in `log/api_json.log` for Grape API endpoints
...
Closes #36189
2017-09-06 23:09:27 -07:00
2915bb2707
Add API support for wiki pages
2017-09-07 09:21:52 +11:00
6c49a62800
Restore some changes from !9199
2017-09-06 12:54:09 -05:00
29a34b3c28
Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'
...
Add API endpoint for downloading a single job artifact
Closes #37196
See merge request !14027
2017-09-06 15:58:26 +00:00
ba39b26cc2
Merge branch '35942_api_binary_encoding' into 'master'
...
API fix for non UTF-8 data
Closes #35942
See merge request !14038
2017-09-06 15:55:35 +00:00
235b105c91
Finish migration to the new events setup
...
This finishes the procedure for migrating events from the old format
into the new format. Code no longer uses the old setup and the database
tables used during the migration process are swapped, with the old table
being dropped.
While the database migration can be reversed this will 1) take a lot of
time as data has to be coped around 2) won't restore data in the
"events.data" column as we have no way of restoring this.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241
2017-09-06 16:40:31 +02:00
021fb512e3
Merge branch 'gitaly-shell-redis-2' into 'master'
...
Internal API changes to decouple redis from Shell
Closes gitaly#520
See merge request !13971
2017-09-06 13:29:16 +00:00
c9aa793215
revert to using a simple representation
2017-09-06 09:01:53 -04:00
bca72f5906
wip: fake its a binary diff
2017-09-06 09:01:53 -04:00
ec7a12da81
Revert moving authorization hook in jobs API
2017-09-06 14:45:28 +02:00
3b9f9aa00b
Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/download-single-job-artifact-using-api
...
* commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
2017-09-06 14:29:17 +02:00
c922fb4b68
Respond with a bad request if artifact path is invalid
2017-09-06 11:31:08 +02:00
80b3dcc777
Extract job artifacts API code to a separate file
2017-09-06 11:20:12 +02:00
a3f76b76a4
change collapse to resolve and comments to discussions
2017-09-06 10:07:47 +01:00
Sean McGivern
David Turner
Rémy Coutable
Markus Koller
Douwe Maan
James Lopez
Tiago Botelho
Mehdi Lahmam
Mark Fletcher
Andrew Newdigate
haseeb
Vitaliy @blackst0ne Klachkov
Robert Speicher
Robert Speicher
Stan Hu
Grzegorz Bizon
Maxim Rydkin
Annabel Dunstone Gray
Rubén Dávila
Ruben Davila
Douwe Maan
Kamil Trzciński
Yorick Peterse
micael.bergeron
Grzegorz Bizon
Ashley Dumaine