summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '53030-ee-compat-check-frozen-literal' into 'master'test-review-root-passwordSean McGivern2018-10-231-4/+6
|\
| * Fix ee-compat-check by not modifying frozen strings53030-ee-compat-check-frozen-literalMario de la Ossa2018-10-231-4/+6
* | Merge branch 'mysql-migration-trigger-permissions' into 'master'Andreas Brandl2018-10-231-1/+1
|\ \
| * | Add dbname to MySQL migration GRANT commandRyan Hefner2018-09-131-1/+1
* | | Merge branch 'support-license-management-and-performance' into 'master'Grzegorz Bizon2018-10-231-1/+3
|\ \ \
| * | | Support licenses and performancesupport-license-management-and-performanceKamil Trzciński2018-10-221-1/+3
* | | | Merge branch 'add-role-binding-to-kubeclient' into 'master'Kamil Trzciński2018-10-232-0/+54
|\ \ \ \
| * | | | Add RoleBinding methodsadd-role-binding-to-kubeclientMayra Cabrera2018-10-222-0/+54
| | |_|/ | |/| |
* | | | Remove broken git storage for testingZeger-Jan van de Weg2018-10-231-1/+4
* | | | Merge branch 'sh-pages-eof-error' into 'master'Grzegorz Bizon2018-10-231-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix EOF detection with CI artifacts metadataStan Hu2018-10-181-2/+5
* | | | Merge branch 'feature/gb/improve-include-config-errors-reporting' into 'master'Douwe Maan2018-10-2211-181/+253
|\ \ \ \
| * | | | Improve error message when `include` is blockedGrzegorz Bizon2018-10-221-5/+3
| * | | | Improve remote CI/CD config file extension validationGrzegorz Bizon2018-10-191-2/+2
| * | | | Extend error message in case of HTTP errors in `include`Grzegorz Bizon2018-10-193-20/+28
| * | | | Refactor `include` code and improve error reportingGrzegorz Bizon2018-10-184-37/+94
| * | | | Extract method that fetchesremote CI/CD included configGrzegorz Bizon2018-10-182-11/+10
| * | | | Add IncludeError exception and use it in CI configGrzegorz Bizon2018-10-182-4/+5
| * | | | Move external CI config class into proper namespaceGrzegorz Bizon2018-10-166-101/+110
| * | | | Move external CI config files into Ci class contextGrzegorz Bizon2018-10-165-0/+0
* | | | | Merge branch '51716-add-kubernetes-namespace-model' into 'master'Andreas Brandl2018-10-221-0/+9
|\ \ \ \ \
| * | | | | Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-modelMayra Cabrera2018-10-221-0/+9
* | | | | | Merge branch 'ce-52112-fix-review-apps-cleanup-ce' into 'master'Nick Thomas2018-10-222-20/+96
|\ \ \ \ \ \
| * | | | | | Improve automated Review Apps cleanupce-52112-fix-review-apps-cleanup-ceRémy Coutable2018-10-222-20/+96
* | | | | | | Merge branch 'drop-allow_overflow-option-duration_in_numbers' into 'master'Grzegorz Bizon2018-10-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Drop `allow_overflow` option in `TimeHelper.duration_in_numbers`Shinya Maeda2018-10-181-1/+1
* | | | | | | | Merge branch '52559-applications-api-get-delete' into 'master'Rémy Coutable2018-10-222-0/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Use application finder for Doorkeeper ApplicationsJB Vasseur2018-10-151-6/+3
| * | | | | | | Do not return secret from GET /applications !22296JB Vasseur2018-10-121-1/+1
| * | | | | | | disable CodeReuse/ActiveRecordJB Vasseur2018-10-121-0/+2
| * | | | | | | Improve call for retrieving all applications !22296JB Vasseur2018-10-121-1/+1
| * | | | | | | Support GET /applications and DELETE /applications/:id endpoints #52559JB Vasseur2018-10-111-0/+17
| * | | | | | | Expose id and name attributes to Applications APIJB Vasseur2018-10-111-0/+2
* | | | | | | | Merge branch 'use-raw-file-format' into 'master'Grzegorz Bizon2018-10-223-46/+75
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Make all legacy security reports to use raw formatuse-raw-file-formatKamil Trzciński2018-10-163-46/+75
* | | | | | | | Enable frozen string for lib/gitlab/*.rbgfyoung2018-10-22150-22/+322
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'ce-5987-group-file-templates' into 'master'Robert Speicher2018-10-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Backport CE to changes to support group-level file templatesNick Thomas2018-10-191-1/+1
* | | | | | | | Rename "scheduled" label/badge of delayed jobs to "delayed"Shinya Maeda2018-10-195-8/+8
* | | | | | | | Merge branch 'bvl-remove-forked-project-link' into 'master'Sean McGivern2018-10-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-191-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Catch `RedirectionTooDeep` Exception in webhooksHeinrich Lee Yu2018-10-191-0/+7
| |/ / / / / / |/| | | | | |
* | | | | | | Add support for JSON logging for audit eventsStan Hu2018-10-181-0/+9
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'bw-fix-hamllint' into 'master'Robert Speicher2018-10-181-3/+3
|\ \ \ \ \ \
| * | | | | | Fix uninitialized constant HamlLint::LinterBrett Walker2018-10-171-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Make getting a user by the username case insensitiveWilliam George2018-10-187-21/+13
|/ / / / /
* | | | | [ci skip] Fix documentation of Gitlab::Git::Diff#filter_diff_options flagsAlejandro Rodríguez2018-10-171-1/+1
* | | | | Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-173-15/+250
|\ \ \ \ \
| * | | | | Remove a dependency on gitlab-gollum-libnick.thomas/gitlab-ce-44361-remove-gitlab-gritNick Thomas2018-10-161-10/+14
| * | | | | Remove explicit requires from flowdockNick Thomas2018-10-162-5/+0