summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-grape-logging-status-code' into 'master'Douwe Maan2018-05-181-8/+9
|\
| * Fix api_json.log not always reporting the right HTTP status codeStan Hu2018-05-171-8/+9
* | Move API group deletion to SidekiqStan Hu2018-05-182-3/+6
|/
* Fix: Use case in-sensitive ordering by name for groupsHarish Ved2018-05-171-0/+2
* Preload pipeline data for project pipelinesYorick Peterse2018-05-171-0/+28
* Merge branch 'zj-workhorse-commit-patch-diff' into 'master'Grzegorz Bizon2018-05-171-25/+0
|\
| * Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-161-25/+0
* | Merge branch 'jprovazn-remote-upload-destroy' into 'master'Kamil Trzciński2018-05-162-0/+2
|\ \
| * | Whitelisted query limits for group destroy APIjprovazn-remote-upload-destroyJan Provaznik2018-05-162-0/+2
* | | Merge branch '46010-allow-managing-group-runners-via-api' into 'master'Kamil Trzciński2018-05-162-15/+10
|\ \ \
| * | | Remove unnecessary runner.is_shared? checks in api because they are handled b...Dylan Griffith2018-05-161-2/+0
| * | | Allow admin to assign shared runner to project through APIDylan Griffith2018-05-161-2/+2
| * | | Change policy list_runner_jobs -> read_runnerDylan Griffith2018-05-161-1/+1
| * | | Rename User#ci_authorized_runners -> ci_owned_runnersDylan Griffith2018-05-162-2/+2
| * | | Use can? policies for lib/api/runners.rbDylan Griffith2018-05-161-9/+5
| * | | Allow group runners to be viewed/edited in APIDylan Griffith2018-05-161-0/+1
| |/ /
* | | Merge branch 'sh-fast-admin-counts' into 'master'Yorick Peterse2018-05-161-0/+48
|\ \ \
| * | | Fix Error 500 viewing admin page due to statement timeoutsStan Hu2018-05-161-0/+48
| |/ /
* | | Merge branch 'fix-metrics-doorkeeper' into 'master'Nick Thomas2018-05-161-1/+5
|\ \ \
| * | | Fix GPM content types for DoorkeeperYorick Peterse2018-05-161-1/+5
| |/ /
* | | Merge branch 'zj-add-branch-mandatory' into 'master'Douwe Maan2018-05-161-23/+3
|\ \ \ | |/ / |/| |
| * | Move Gitlab::Git::Repository#add_branch to mandatoryZeger-Jan van de Weg2018-05-141-23/+3
* | | Merge branch 'zj-ref-contains-sha-mandatory' into 'master'Robert Speicher2018-05-161-37/+2
|\ \ \
| * | | Ref contains oid check done by GitalyZeger-Jan van de Weg2018-05-141-37/+2
| |/ /
* | | Merge branch 'fix-metrics-content-types' into 'master'Stan Hu2018-05-151-13/+1
|\ \ \
| * | | Fix setting Gitlab metrics content typesYorick Peterse2018-05-151-13/+1
* | | | Merge branch 'sh-enforce-unique-and-not-null-project-ids-project-features' in...Yorick Peterse2018-05-151-1/+1
|\ \ \ \
| * | | | Add a unique and not null constraint on the project_features.project_id columnStan Hu2018-05-151-1/+1
| |/ / /
* | | | Remove authentication for readonly endpoints in issues APIhaseeb2018-05-151-1/+2
|/ / /
* | | Disable greedy mode when matching filenameJan Provaznik2018-05-151-1/+1
* | | Merge branch 'blackst0ne-remove-spinach' into 'master'Rémy Coutable2018-05-152-61/+0
|\ \ \ | |_|/ |/| |
| * | Clean up test.rakeblackst0ne2018-05-141-1/+0
| * | Remove spinach.rakeblackst0ne2018-05-141-60/+0
| |/
* | Merge branch 'backstage/gb/backport-untrusted-regexp-ee-code' into 'master'Rémy Coutable2018-05-141-1/+18
|\ \
| * | Backport EE-specific untrusted regexp implementationGrzegorz Bizon2018-05-141-1/+18
* | | Fix system hook not firing for blocked users when LDAP sign-in is usedStan Hu2018-05-121-1/+3
| |/ |/|
* | Merge branch 'rd-remove-duplicate-method' into 'master'Robert Speicher2018-05-111-5/+0
|\ \
| * | Remove duplicate methodRubén Dávila2018-05-101-5/+0
* | | Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-114-6/+63
|\ \ \
| * | | Allow triggered builds git accessBob Van Landuyt2018-05-112-1/+17
| * | | Block access to API & git when terms are enforcedBob Van Landuyt2018-05-103-5/+46
| |/ /
* | | Merge branch 'zj-remove-repo-path-strip-storage-path' into 'master'Douwe Maan2018-05-111-17/+2
|\ \ \
| * | | Remove Gitlab::RepoPath.strip_storage_pathZeger-Jan van de Weg2018-05-111-17/+2
| | |/ | |/|
* | | Merge branch 'zj-wiki-find-file-opt-out' into 'master'Douwe Maan2018-05-111-1/+2
|\ \ \
| * | | Wiki Find Page to opt_outZeger-Jan van de Weg2018-05-111-1/+2
| | |/ | |/|
* | | Merge branch '46233-rails5-fix-nomethoderror-undefined-method-for-3-string' i...Douwe Maan2018-05-111-1/+1
|\ \ \ | |_|/ |/| |
| * | [Rails5] Fix `per_page` in lib/gitlab/multi_collection_paginator.rb46233-rails5-fix-nomethoderror-undefined-method-for-3-stringblackst0ne2018-05-111-1/+1
| |/
* | Merge branch 'zj-validation-initializer' into 'master'Kamil Trzciński2018-05-111-1/+10
|\ \ | |/ |/|
| * Remove method call to deprecated methodZeger-Jan van de Weg2018-05-111-1/+10
* | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'Nick Thomas2018-05-101-0/+8
|\ \