f9f4672275
Send a confirmation email when the user adds a secondary email address. Utilizes the Devise `confirmable` capabilities. Issue #37385
2017-09-23 15:23:11 +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
ef4b3a39bc
Add functionality to collapse outdated diff comments regardless of discussion resolution
2017-09-06 10:07:46 +01:00
ff3eeffa08
Implement /internal/pre-receive for shell operations
2017-09-05 20:12:25 -03:00
8323e55b6c
Return a value to check if redis is available on /internal/check
2017-09-05 20:12:18 -03:00
97371848c5
API: Add GPG key management for admins
2017-09-05 14:30:53 +02:00
b69579742b
API: Add GPG key management
2017-09-05 14:30:53 +02:00
d4154ef30f
Do not require API authentication if artifacts are public
2017-09-05 13:22:15 +02:00
960b8cd460
Merge branch 'api_branches_head' into 'master'
...
Add branch existence check to the APIv4 branches via HEAD request
Closes #37159
See merge request !13979
2017-09-05 11:05:30 +00:00
3b874414c0
Do not use artifacts metadata to access single artifact
2017-09-05 12:34:49 +02:00
dd157e458c
Merge branch 'issue-api-my-reaction' into 'master'
...
Add my_reaction_emoji param to /issues and /merge_requests API
See merge request !14016
2017-09-05 10:07:22 +00:00
02aa269e34
Add branch existence check to the APIv4 branches via HEAD request
2017-09-05 20:54:12 +11:00
6523ba1d5a
Merge branch 'feature/sm/34518-extend-api-pipeline-schedule-variable-new' into 'master'
...
Extend API: Pipeline Schedule Variable
Closes #34518
See merge request !13653
2017-09-05 09:52:41 +00:00
3d61421fb2
Merge branch 'fix/sm/35650-remove-createtriggerrequestservice-and-forbid-to-persist-variables-on-ci-triggerrequest' into 'master'
...
Removes `CreateTriggerRequestService` and add a blocker to prevent saving variables on `Ci::TriggerRequest`
Closes #35650
See merge request !13792
2017-09-05 09:49:55 +00:00
dfb8fcbb65
Use API helper to send artifact file through Workhorse
2017-09-05 11:16:49 +02:00
Brett Walker
Rémy Coutable
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
Sean McGivern
Douwe Maan
Tiago Botelho
Kamil Trzciński
Yorick Peterse
micael.bergeron
Grzegorz Bizon
Ashley Dumaine
Alejandro Rodríguez
Robert Schilling