summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into 'mas...Rémy Coutable2017-08-012-4/+1
|\
| * 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 'ma...Sean McGivern2017-08-011-2/+0
|\ \
| * | 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
| |/
* | Merge branch '28283-legacy-storage-format' into 'master'Sean McGivern2017-08-0116-27/+28
|\ \ | |/ |/|
| * 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 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 (?) codeJacob Vosmaer2017-07-311-18/+0
* | | | Merge branch 'patch-25' into 'master'Rémy Coutable2017-08-011-3/+3
|\ \ \ \
| * | | | Invalid variableSemen Romanov2017-08-011-3/+3
| | |_|/ | |/| |
* | | | Merge branch '34519-extend-api-group-secret-variable' into 'master'Kamil Trzciński2017-08-013-0/+100
|\ \ \ \ | |/ / / |/| | |
| * | | IniShinya Maeda2017-07-193-0/+100
* | | | Merge branch 'mk-fix-wiki-backup' into 'master'Douwe Maan2017-07-311-0/+1
|\ \ \ \
| * | | | 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 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
* | | | | Merge branch '29385/add_shrug_command' into 'master'Rémy Coutable2017-07-313-5/+70
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixes #29385: Add /shrug and /tableflip commandsAlex Ives2017-07-283-5/+70
| | |/ / | |/| |
* | | | Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'Sean McGivern2017-07-311-1/+1
|\ \ \ \
| * | | | 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 Gitalygitaly-398-git-garbage-collectKim "BKC" Carlbäcker2017-07-281-1/+17
* | | | Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into 'ma...Robert Speicher2017-07-281-1/+1
|\ \ \ \
| * | | | Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca...Rémy Coutable2017-07-281-1/+1
* | | | | 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 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 fa...dm-api-csrf-token-verificationDouwe Maan2017-07-281-0/+8
| |/ / / /
* | | | | Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'Kamil Trzciński2017-07-281-13/+10
|\ \ \ \ \
| * | | | | 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 groupZ.J. van de Weg2017-07-282-0/+17
* | | | | | Merge branch 'gitaly-ruby-bundler' into 'master'Sean McGivern2017-07-281-1/+1
|\ \ \ \ \ \
| * | | | | | 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 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
|\ \ \ \ \ \
| * | | | | | Modify/add some forgotten issues API documentationtc-api-root-merge-requestsToon Claes2017-07-281-2/+2
| * | | | | | Default /merge_request API endpoint to `scope=created-by-me`Toon Claes2017-07-281-1/+3
| * | | | | | Add top-level /merge_requests API endpointToon Claes2017-07-271-31/+64
* | | | | | | Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-272-86/+5
|\ \ \ \ \ \ \
View Lorry Controller Status