14644d40e0
Do not validate CSRF token in API unless needed
2017-08-02 18:20:31 +02:00
da967803cc
Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into 'master'
...
Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs
Closes #35599
See merge request !13126
2017-07-28 18:05:58 +00:00
0bb58ff885
Merge branch 'dm-large-push-performance' into 'master'
...
Load and process at most 100 commits when pushing into default branch
Closes #35531
See merge request !13132
2017-07-28 17:03:17 +00:00
e77e9b0077
Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id
2017-07-28 16:27:10 +00:00
0e355e5c92
Load and process at most 100 commits when pushing into default branch
2017-07-28 17:23:13 +02:00
bd2b68d73e
Merge branch 'dm-api-csrf-token-verification' into 'master'
...
Add log messages to clarify log messages about API CSRF token verification failure
Closes #35705
See merge request !13158
2017-07-28 14:39:36 +00:00
60797a42b4
Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-28 16:33:30 +02:00
d020eabf29
Add log messages to clarify log messages about API CSRF token verification failure
2017-07-28 15:39:39 +02:00
fa1e41ea64
Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'
...
Follow-up from "Allow to use cross project pipelines" ver 2
Closes #35282 , gitlab-ee#2604, and #35584
See merge request !13102
2017-07-28 11:43:00 +00:00
850a22547c
Merge branch 'zj-delete-mm-team' into 'master'
...
Remove Mattermost team with GitLab group
Closes #30023
See merge request !11362
2017-07-28 09:58:20 +00:00
ba81e6defb
Merge branch 'gitaly-ruby-bundler' into 'master'
...
Support the fact that Gitaly uses bundler
See merge request !13135
2017-07-28 09:20:37 +00:00
da3100254f
Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'
...
Backport some recent changes related to LDAP from EE
See merge request !13119
2017-07-28 09:13:50 +00:00
56418e85ac
init
2017-07-28 18:13:29 +09:00
3f1b7b88c8
Merge branch 'tc-api-root-merge-requests' into 'master'
...
Add top-level /merge_requests API endpoint
Closes #28422
See merge request !13060
2017-07-28 07:38:58 +00:00
d7062dd042
Remove Mattermost team with GitLab group
...
When destroying a group, now an API call is made to the Mattermost
server to request the deletion of the project. Actual team deletion on
the Mattermost side happens async, so the runtime shouldn't increase by
more than a second.
2017-07-28 09:09:55 +02:00
02b25598cb
Merge branch 'bvl-add-all-settings-to-api' into 'master'
...
Add all ApplicationSettings attributes to the API
See merge request !12851
2017-07-27 23:55:23 +00:00
39c39ae791
Modify/add some forgotten issues API documentation
...
Should have been part of !13004 .
2017-07-28 00:08:44 +02:00
d77088bb0b
Default /merge_request API endpoint to `scope=created-by-me`
...
This matches the behavior of the /issues endpoint.
2017-07-28 00:07:28 +02:00
d7505de8b3
Add top-level /merge_requests API endpoint
...
And add support for additional query parameters:
- `author_id`: Returns merge requests created by the given user `id`
- `assignee_id`: Returns merge requests assigned to the given user `id`
- `scope`: Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`
2017-07-27 23:34:57 +02:00
8e3f2ecfa9
Incorporate RefsService.FindAllBranches Gitaly RPC
2017-07-27 15:40:54 -04:00
432bb22308
Remove unused Gitlab::Git operations
2017-07-27 15:39:31 -04:00
cd5ae5cb2b
Migrate Repository#tags to Gitaly
...
Closes gitaly#411
2017-07-27 20:07:40 +02:00
066f4d8b71
Merge branch 'remove_custom_devise_failure_app' into 'master'
...
Remove GitLab custom failure app for Devise
See merge request !13136
2017-07-27 16:22:52 +00:00
ac0cbe6970
Merge branch 'feature/gpg-signed-commits' into 'master'
...
GPG signed commits
Closes #20268
See merge request !9546
2017-07-27 15:29:39 +00:00
3d83181b81
Remove GitLab custom fealure app for devise
2017-07-27 18:14:09 +03:00
842bcfa777
Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into 'master'
...
Ensure test files are deleted after fs metrics gathering run
Closes #35457
See merge request !13080
2017-07-27 14:45:02 +00:00
1631ad02fd
Support the fact that Gitaly uses bundler
2017-07-27 16:35:40 +02:00
caad9334a7
Merge branch 'rc/fix-branches-api-endpoint' into 'master'
...
Fix the `/projects/:id/repository/branches endpoint` to handle dots in the branch name when the project full patch contains a `/`
See merge request !13115
2017-07-27 14:33:06 +00:00
0ed42f4b35
Merge branch 'feature/backup-custom-path' into 'master'
...
Support custom directory in gitlab:backup:create task
See merge request !12984
2017-07-27 14:25:43 +00:00
b7c45fc869
Merge branch 'assets-task-compile-langs' into 'master'
...
Compile JS lang files before webpack compile
Closes #35615
See merge request !13122
2017-07-27 13:56:05 +00:00
9488b7780e
optimize query, only select relevant db columns
2017-07-27 15:46:04 +02:00
ef97cb54ae
Backport some recent changes related to LDAP from EE
2017-07-27 08:45:16 -05:00
cd01e82873
store gpg user name and email on the signature
2017-07-27 15:44:39 +02:00
9be1732296
add comment explaining use of shell commands and file operations in the same methods
2017-07-27 15:44:13 +02:00
deb474b413
extract common method
2017-07-27 15:43:37 +02:00
b66e3726dc
also update gpg_signatures when gpg_key is null
2017-07-27 15:43:37 +02:00
7f03282f0f
remove duplicate statement
2017-07-27 15:43:37 +02:00
a7d2ebe508
simplify fetching of commit
2017-07-27 15:43:37 +02:00
4f7ba8f286
fix memoization
2017-07-27 15:43:37 +02:00
ee7468e786
we need to update the gpg_key as well
2017-07-27 15:43:36 +02:00
a01eabc19f
update rugged
...
the rugged versions up to 0.26.0b3 had a bug concerning the signature
extraction. The extracted signature was not always the same, probably
due to a buffer (overflow) issue in libgit.
see https://github.com/libgit2/rugged/issues/608
2017-07-27 15:43:36 +02:00
028ecb081b
need to wrap the raw commit in a commit model
2017-07-27 15:42:53 +02:00
d7f4264368
no need for passing parameter
...
we introduced memoizing, so it's safe to call the method multiple times.
2017-07-27 15:42:53 +02:00
24671cd601
update invalid gpg signatures when key is created
2017-07-27 15:42:53 +02:00
d48eb77a96
allow updating of gpg signature through gpg commit
2017-07-27 15:42:53 +02:00
502e31bec9
memoize verified_signature call
2017-07-27 15:42:53 +02:00
5d5fd4babe
store gpg_key_primary_keyid for unknown gpg keys
...
we need to store the keyid to be able to update the signature later in
case the missing key is added later.
2017-07-27 15:42:53 +02:00
34810acd6c
move signature cache read to Gpg::Commit
...
as we write the cache in the gpg commit class already the read should
also happen there.
This also removes all logic from the main commit class, which just
proxies the call to the Gpg::Commit now.
2017-07-27 15:42:53 +02:00
7b616d39ef
gpg signature is only valid when key is verified
2017-07-27 15:42:53 +02:00
8c4b6a32fc
bail if the commit has no signature
2017-07-27 15:42:53 +02:00
Douwe Maan
Robert Speicher
Richard Clamp
Sean McGivern
Rémy Coutable
Kamil Trzciński
Douwe Maan
Shinya Maeda
Z.J. van de Weg
Toon Claes
Alejandro Rodríguez
Ahmad Sherif
Dmitriy Zaporozhets
Valery Sizov
Jacob Vosmaer
Rubén Dávila
Alexis Reigel
Pawel Chojnacki