summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add changelogfix-too-many-loops-cron-errorFabio Pitino2019-05-071-0/+5
* Remove temporary workaround rescuing RuntimeErrorFabio Pitino2019-05-071-9/+1
* Merge branch 'fix-too-many-loops-cron-error' of https://gitlab.com/gitlab-org...Fabio Pitino2019-05-071-1/+9
|\
| * Merge branch 'fix-too-many-loops-cron-error' of https://gitlab.com/gitlab-org...Fabio Pitino2019-05-020-0/+0
| |\
| | * Rescue RuntimeError when "too many loops" are reached by Fugit::CronFabio Pitino2019-05-021-1/+9
| | * Write test that exposes bug with Fugit gemFabio Pitino2019-04-301-0/+7
| * | Rescue RuntimeError when "too many loops" are reached by Fugit::CronFabio Pitino2019-05-021-1/+9
| * | Write test that exposes bug with Fugit gemFabio Pitino2019-05-021-0/+7
* | | Remove workaround by upgrading Fugit gemFabio Pitino2019-05-074-21/+6
* | | Rescue RuntimeError when "too many loops" occurFabio Pitino2019-05-072-1/+16
* | | Write test that exposes bug with Fugit gemFabio Pitino2019-05-071-0/+7
* | | Merge branch 'fix-schedule-head-pipeline-update-method' into 'master'Ash McKenzie2019-05-073-19/+28
|\ \ \
| * | | Fix schedule head pipeline updatefix-schedule-head-pipeline-update-methodShinya Maeda2019-05-063-19/+28
* | | | Merge branch 'docs-destroy-the-mirrors' into 'master'Evan Read2019-05-072-2/+4
|\ \ \ \
| * | | | Correct repo mirror SSH key generation docsdocs-destroy-the-mirrorsLuke Bennett2019-05-032-2/+4
* | | | | Merge branch 'winh-refactoring-issue-template-docs' into 'master'Stan Hu2019-05-061-0/+41
|\ \ \ \ \
| * | | | | Add issue template for refactoringswinh-refactoring-issue-template-docsWinnie Hellmann2019-04-301-0/+41
* | | | | | Merge branch 'member-access-granted-leave-email-fe' into 'master'Fatih Acet2019-05-0612-8/+110
|\ \ \ \ \ \
| * | | | | | Add leave link to access_granted emailmember-access-granted-leave-email-feLuke Bennett2019-05-0312-8/+110
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ce-mw-onboarding-mvc' into 'master'Fatih Acet2019-05-062-0/+34
|\ \ \ \ \ \
| * | | | | | Onboarding welcome pageMartin Wortschack2019-05-062-0/+34
|/ / / / / /
* | | | | | Merge branch '51963-support-prometheus-for-group-level-clusters' into 'master'Fatih Acet2019-05-063-2/+6
|\ \ \ \ \ \
| * | | | | | Resolve "Support Prometheus for group-level clusters"Peter Leitzen2019-05-063-2/+6
|/ / / / / /
* | | | | | Merge branch 'graphql-resolvers-complexity' into 'master'Ash McKenzie2019-05-0612-4/+146
|\ \ \ \ \ \
| * | | | | | GraphQL - Add extra complexity for resolversJan Provaznik2019-05-0612-4/+146
|/ / / / / /
* | | | | | Merge branch 'add-spec-for-optimistic-locking-error' into 'master'Mayra Cabrera2019-05-063-0/+65
|\ \ \ \ \ \
| * | | | | | Fix editing issues and MRs with NULL lock_versionSean McGivern2019-05-063-0/+65
|/ / / / / /
* | | | | | Merge branch 'upgrade-gitlab-ui' into 'master'Clement Ho2019-05-062-5/+5
|\ \ \ \ \ \
| * | | | | | Upgrade GitLab UI to 3.10.0upgrade-gitlab-uiLukas Eipert2019-05-062-5/+5
* | | | | | | Merge branch 'issue_57906_fix_github_import' into 'master'Sean McGivern2019-05-0611-1/+169
|\ \ \ \ \ \ \
| * | | | | | | Fix issuables state_id nil when importing projects from GitHubFelipe Artur2019-05-0611-1/+169
|/ / / / / / /
* | | | | | | Merge branch 'ce-11194-fix-approvals-groups-all-available' into 'master'Fatih Acet2019-05-061-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add close_select2 method to select2_helperce-11194-fix-approvals-groups-all-availablePaul Slaughter2019-05-011-0/+4
* | | | | | | Merge branch 'add-mayra-cabrera-to-codeowners' into 'master'Sean McGivern2019-05-061-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Add Mayra Cabrera to codeownersMayra Cabrera2019-05-061-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Clement Ho2019-05-062-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Update dependency @gitlab/svgs to ^1.60.0Lukas 'Eipi' Eipert2019-05-062-5/+5
* | | | | | | | Merge branch '61469-align-play-icon' into 'master'Kushal Pandya2019-05-063-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Aligns the play button for stages61469-align-play-iconFilipa Lacerda2019-05-063-1/+11
* | | | | | | | | Merge branch '51963-support-prometheus-for-group-level-clusters-backend' into...Bob Van Landuyt2019-05-0610-12/+32
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Show health graphs on group-levelPeter Leitzen2019-05-0610-12/+32
|/ / / / / / / /
* | | | | | | | Merge branch '61431-move-build-qa-image-to-test-stage' into 'master'Stan Hu2019-05-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Move the build-qa-image to the test stageRémy Coutable2019-05-061-1/+1
* | | | | | | | | Merge branch 'its-simple-just-destroy-the-mirrors' into 'master'Nick Thomas2019-05-069-149/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Destroy repo mirrors instead of disabling themLuke Bennett2019-05-069-149/+29
|/ / / / / / / / /
* | | | | | | | | Merge branch '46806-typed-ci-variables' into 'master'Lin Jen-Shin2019-05-0637-49/+237
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Implement support for CI variables of type fileKrasimir Angelov2019-05-0637-49/+237
|/ / / / / / / / /
* | | | | | | | | Merge branch '61203-fix-lfs-ui-upload' into 'master'Nick Thomas2019-05-063-1/+32
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix uploading of LFS tracked file through UIPatrick Bajao2019-05-063-1/+32
|/ / / / / / / /
* | | | | | | | Merge branch 'qa-escape-netrc-regex' into 'master'Sanad Liaquat2019-05-062-1/+10
|\ \ \ \ \ \ \ \