summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-022-11/+27
| | | | Closes gitaly#415
* Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into ↵Rémy Coutable2017-08-012-4/+1
|\ | | | | | | | | | | | | | | | | 'master' Fix "API specs and linting failing on master" Closes #35825 See merge request !13227
| * Add 204. Remove duplicated method.fix/sm/35825-api-specs-and-linting-failing-on-masterShinya Maeda2017-08-012-4/+1
| |
* | Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into ↵Sean McGivern2017-08-011-2/+0
|\ \ | | | | | | | | | | | | | | | | | | 'master' Always fetch branches before finding the merge base, otherwise we could find an outdated merge base See merge request !13226
| * | Always fetch branches before finding the merge base, otherwise we could find ↵rc/fetch-before-finding-merge-base-in-ee_compat_checkRémy Coutable2017-08-011-2/+0
| |/ | | | | | | | | | | an outdated merge base Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '28283-legacy-storage-format' into 'master'Sean McGivern2017-08-0116-27/+28
|\ \ | |/ |/| | | | | [CE] Added Legacy Storage format See merge request !13149
| * Rename ensure_dir_exist -> ensure_storage_path_existGabriel Mazetto2017-08-011-1/+1
| |
| * Added some extra TODOs for the Legacy Storage refactorGabriel Mazetto2017-08-011-0/+1
| |
| * Rename more path_with_namespace -> full_path or disk_pathGabriel Mazetto2017-08-017-10/+10
| |
| * Rename path_with_namespace -> disk_path when dealing with the filesystemGabriel Mazetto2017-08-012-3/+3
| |
| * Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-019-14/+14
| |
* | Merge branch 'gitaly-commit-languages' into 'master'Sean McGivern2017-08-013-3/+43
|\ \ | | | | | | | | | | | | Add option to use Gitaly CommitLanguages RPC See merge request !13084
| * | Add option to use CommitLanguages RPCJacob Vosmaer2017-08-012-0/+34
| | |
| * | CI fixes for gitaly-rubyJacob Vosmaer2017-08-011-3/+9
| | |
* | | Merge branch 'remove-content-commit' into 'master'Douwe Maan2017-08-011-18/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove unused Gitlab::Diff code See merge request !13195
| * | | Remove unused (?) codeJacob Vosmaer2017-07-311-18/+0
| | | |
* | | | Merge branch 'patch-25' into 'master'Rémy Coutable2017-08-011-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Invalid variable See merge request !13214
| * | | | Invalid variableSemen Romanov2017-08-011-3/+3
| | |_|/ | |/| |
* | | | Merge branch '34519-extend-api-group-secret-variable' into 'master'Kamil Trzciński2017-08-013-0/+100
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Extend API: Group Secret Variable Closes #34519 See merge request !12936
| * | | IniShinya Maeda2017-07-193-0/+100
| | | |
* | | | Merge branch 'mk-fix-wiki-backup' into 'master'Douwe Maan2017-07-311-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix improperly skipped backups of wikis Closes #28854 See merge request !13096
| * | | | Protect backups from stale cache for repo existsMichael Kozono2017-07-281-0/+1
| | | | |
* | | | | Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master'Kamil Trzciński2017-07-312-21/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Improve deploy environment chatops slash command Closes #34748 See merge request !13150
| * | | | Improve wording related to deploy chatops commandfix/gb/fix-chatops-deploy-multiple-actions-matchingGrzegorz Bizon2017-07-281-1/+1
| | | | |
| * | | | Improve deploy environment chatops slash commandGrzegorz Bizon2017-07-282-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now match deployment actions better. If there is more than one deployment action matched, we check if there is an action which name equals to environment name, instead of raising an error about too many actions defined.
* | | | | Merge branch '29385/add_shrug_command' into 'master'Rémy Coutable2017-07-313-5/+70
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes #29385: Add /shrug and /tableflip commands Closes #29385 See merge request !10068
| * | | | Fixes #29385: Add /shrug and /tableflip commandsAlex Ives2017-07-283-5/+70
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated DSL to support substitution definitions - Added substitution definition, inherits from command definition - Added tabelflip and shrug substitutions to interpret service - Added support for substitution definitions to the extractor for preview mode. - Added substitution handling in the interpret service Signed-off-by: Alex Ives <alex@ives.mn>
* | | | Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'Sean McGivern2017-07-311-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-verificationDouwe Maan2017-07-311-1/+1
| |/ / /
* | | | Merge branch 'gitaly-398-git-garbage-collect' into 'master'Sean McGivern2017-07-311-1/+17
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Migrate GitGarbageCollectWorker to Gitaly Closes gitaly#398 See merge request !12975
| * | | Migrate GitGarbageCollectWorker to Gitalygitaly-398-git-garbage-collectKim "BKC" Carlbäcker2017-07-281-1/+17
| | | |
* | | | Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵Robert Speicher2017-07-281-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 Coutable2017-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'dm-large-push-performance' into 'master'Robert Speicher2017-07-281-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 branchDouwe Maan2017-07-281-2/+2
| | | | | |
* | | | | | Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_idRichard Clamp2017-07-281-2/+6
| | | | | |
* | | | | | Merge branch 'dm-api-csrf-token-verification' into 'master'Sean McGivern2017-07-281-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-verificationDouwe Maan2017-07-281-0/+8
| |/ / / / | | | | | | | | | | | | | | | failure
* | | | | Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'Kamil Trzciński2017-07-281-13/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up from "Allow to use cross project pipelines" ver 2 Closes #35282, gitlab-ee#2604, and #35584 See merge request !13102
| * | | | | initShinya Maeda2017-07-281-13/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'zj-delete-mm-team' into 'master'Douwe Maan2017-07-282-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Mattermost team with GitLab group Closes #30023 See merge request !11362
| * | | | | Remove Mattermost team with GitLab groupZ.J. van de Weg2017-07-282-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 McGivern2017-07-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support the fact that Gitaly uses bundler See merge request !13135
| * | | | | | Support the fact that Gitaly uses bundlerJacob Vosmaer2017-07-271-1/+1
| | | | | | |
* | | | | | | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan2017-07-281-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-checksRubén Dávila2017-07-271-0/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'tc-api-root-merge-requests' into 'master'Sean McGivern2017-07-282-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-requestsToon Claes2017-07-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Should have been part of !13004.
| * | | | | | Default /merge_request API endpoint to `scope=created-by-me`Toon Claes2017-07-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the behavior of the /issues endpoint.
| * | | | | | Add top-level /merge_requests API endpointToon Claes2017-07-271-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`
View Lorry Controller Status