| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dm-ldap-authentication-ssl-verification' into 'master' | Sean McGivern | 2017-07-31 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor Closes #35752 See merge request !13185 | ||||
| | * | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptordm-ldap-authentication-ssl-verification | Douwe Maan | 2017-07-31 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'gitaly-398-git-garbage-collect' into 'master' | Sean McGivern | 2017-07-31 | 1 | -1/+17 |
| |\ \ | |/ |/| | | | | | | | | | Migrate GitGarbageCollectWorker to Gitaly Closes gitaly#398 See merge request !12975 | ||||
| | * | Migrate GitGarbageCollectWorker to Gitalygitaly-398-git-garbage-collect | Kim "BKC" Carlbäcker | 2017-07-28 | 1 | -1/+17 |
| | | | |||||
| * | | Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵ | Robert Speicher | 2017-07-28 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '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 | ||||
| | * | | Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵ | Rémy Coutable | 2017-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Merge branch 'dm-large-push-performance' into 'master' | Robert Speicher | 2017-07-28 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Load and process at most 100 commits when pushing into default branch Closes #35531 See merge request !13132 | ||||
| | * | | | Load and process at most 100 commits when pushing into default branch | Douwe Maan | 2017-07-28 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id | Richard Clamp | 2017-07-28 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | Merge branch 'dm-api-csrf-token-verification' into 'master' | Sean McGivern | 2017-07-28 | 1 | -0/+8 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Add log messages to clarify log messages about API CSRF token verification failure Closes #35705 See merge request !13158 | ||||
| | * | | | Add log messages to clarify log messages about API CSRF token verification ↵dm-api-csrf-token-verification | Douwe Maan | 2017-07-28 | 1 | -0/+8 |
| | |/ / | | | | | | | | | | failure | ||||
| * | | | Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master' | Kamil Trzciński | 2017-07-28 | 1 | -13/+10 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up from "Allow to use cross project pipelines" ver 2 Closes #35282, gitlab-ee#2604, and #35584 See merge request !13102 | ||||
| | * | | | init | Shinya Maeda | 2017-07-28 | 1 | -13/+10 |
| | | | | | |||||
| * | | | | Merge branch 'zj-delete-mm-team' into 'master' | Douwe Maan | 2017-07-28 | 2 | -0/+17 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Mattermost team with GitLab group Closes #30023 See merge request !11362 | ||||
| | * | | | | Remove Mattermost team with GitLab group | Z.J. van de Weg | 2017-07-28 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | Merge branch 'gitaly-ruby-bundler' into 'master' | Sean McGivern | 2017-07-28 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Support the fact that Gitaly uses bundler See merge request !13135 | ||||
| | * | | | | | Support the fact that Gitaly uses bundler | Jacob Vosmaer | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master' | Douwe Maan | 2017-07-28 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Backport some recent changes related to LDAP from EE See merge request !13119 | ||||
| | * | | | | | Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checks | Rubén Dávila | 2017-07-27 | 1 | -0/+6 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'tc-api-root-merge-requests' into 'master' | Sean McGivern | 2017-07-28 | 2 | -33/+68 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add top-level /merge_requests API endpoint Closes #28422 See merge request !13060 | ||||
| | * | | | | | Modify/add some forgotten issues API documentationtc-api-root-merge-requests | Toon Claes | 2017-07-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Should have been part of !13004. | ||||
| | * | | | | | Default /merge_request API endpoint to `scope=created-by-me` | Toon Claes | 2017-07-28 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This matches the behavior of the /issues endpoint. | ||||
| | * | | | | | Add top-level /merge_requests API endpoint | Toon Claes | 2017-07-27 | 1 | -31/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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` | ||||
| * | | | | | | Merge branch 'bvl-add-all-settings-to-api' into 'master' | Robert Speicher | 2017-07-27 | 2 | -86/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all ApplicationSettings attributes to the API See merge request !12851 | ||||
| | * | | | | | | Remove deprecated `repository_storage` attributebvl-add-all-settings-to-api | Bob Van Landuyt | 2017-07-27 | 1 | -54/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In favor of the new `repository_storages` | ||||
| | * | | | | | | Make the attribute list for application settings reusable | Bob Van Landuyt | 2017-07-27 | 2 | -32/+4 |
| | | | | | | | | |||||
| * | | | | | | | Incorporate RefsService.FindAllBranches Gitaly RPCgitaly-all-branches | Alejandro Rodríguez | 2017-07-27 | 3 | -5/+22 |
| | | | | | | | | |||||
| * | | | | | | | Remove unused Gitlab::Git operations | Alejandro Rodríguez | 2017-07-27 | 1 | -162/+0 |
| | |/ / / / / |/| | | | | | |||||
| * | | | | | | Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitaly | Ahmad Sherif | 2017-07-27 | 2 | -13/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#411 | ||||
| * | | | | | | Merge branch 'remove_custom_devise_failure_app' into 'master' | Robert Speicher | 2017-07-27 | 1 | -23/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove GitLab custom failure app for Devise See merge request !13136 | ||||
| | * | | | | | | Remove GitLab custom fealure app for devise | Valery Sizov | 2017-07-27 | 1 | -23/+0 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'feature/gpg-signed-commits' into 'master' | Dmitriy Zaporozhets | 2017-07-27 | 4 | -1/+176 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GPG signed commits Closes #20268 See merge request !9546 | ||||
| | * | | | | | | | optimize query, only select relevant db columns | Alexis Reigel | 2017-07-27 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | store gpg user name and email on the signature | Alexis Reigel | 2017-07-27 | 2 | -8/+19 |
| | | | | | | | | | |||||
| | * | | | | | | | extract common method | Alexis Reigel | 2017-07-27 | 1 | -13/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | also update gpg_signatures when gpg_key is null | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | remove duplicate statement | Alexis Reigel | 2017-07-27 | 1 | -4/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | simplify fetching of commit | Alexis Reigel | 2017-07-27 | 1 | -3/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | fix memoization | Alexis Reigel | 2017-07-27 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | we need to update the gpg_key as well | Alexis Reigel | 2017-07-27 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | update rugged | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | need to wrap the raw commit in a commit model | Alexis Reigel | 2017-07-27 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | no need for passing parameter | Alexis Reigel | 2017-07-27 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we introduced memoizing, so it's safe to call the method multiple times. | ||||
| | * | | | | | | | update invalid gpg signatures when key is created | Alexis Reigel | 2017-07-27 | 1 | -0/+19 |
| | | | | | | | | | |||||
| | * | | | | | | | allow updating of gpg signature through gpg commit | Alexis Reigel | 2017-07-27 | 1 | -1/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | memoize verified_signature call | Alexis Reigel | 2017-07-27 | 1 | -8/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | store gpg_key_primary_keyid for unknown gpg keys | Alexis Reigel | 2017-07-27 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to store the keyid to be able to update the signature later in case the missing key is added later. | ||||
| | * | | | | | | | move signature cache read to Gpg::Commit | Alexis Reigel | 2017-07-27 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | | | | | gpg signature is only valid when key is verified | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | bail if the commit has no signature | Alexis Reigel | 2017-07-27 | 1 | -2/+4 |
| | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |