summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-api-current-user' into 'master'Sean McGivern2017-08-032-1/+3
|\
| * Do not validate CSRF token in API unless neededdm-api-current-userDouwe Maan2017-08-022-1/+3
* | Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master'Rémy Coutable2017-08-021-2/+7
|\ \
| * | Uniquify reserved word usernames on OAuth user creationRobin Bobbitt2017-08-021-2/+7
* | | Merge branch 'api_project_events_target_iid' into 'master'Rémy Coutable2017-08-021-1/+1
|\ \ \
| * | | Expose target_iid in Events APIsue4452017-08-021-1/+1
* | | | Extending API for protected branchesEric2017-08-024-3/+104
* | | | Merge branch 'rugged-is-ancestor' into 'master'Sean McGivern2017-08-021-0/+7
|\ \ \ \
| * | | | Add rugged_is_ancestor methodJacob Vosmaer2017-08-011-0/+7
* | | | | Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into 'mas...Douwe Maan2017-08-023-21/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove default arguments for common query contextpawel/add_more_variables_to_additional_metrics-35267Pawel Chojnacki2017-08-012-2/+4
| * | | | Move timeframe_start and timeframe_end to common query contextPawel Chojnacki2017-08-013-14/+8
| * | | | Give metric query context rspec examples correctly sounding names. + missing ...Pawel Chojnacki2017-08-011-0/+1
| * | | | Context handling and tests cleanup + simple test kube_namespace context testPawel Chojnacki2017-07-311-11/+9
| * | | | add kube_namespace and standardize common variables for additional metrics qu...Pawel Chojnacki2017-07-313-12/+24
* | | | | 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