summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes2017-05-051-0/+2
|\
| * Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-05-045-64/+125
| |\
| * \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0412-32/+127
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0313-148/+299
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-283-1/+14
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-289-37/+84
| |\ \ \ \ \
| * | | | | | Attempted adding separate clientside_sentry settingsLuke "Jared" Bennett2017-04-281-0/+2
* | | | | | | Support comments for personal snippetsJarka Kadlecova2017-05-054-53/+45
* | | | | | | Merge branch '30237-pipelines-actions-make-2-requests' into 'master' Kamil Trzciński2017-05-051-2/+16
|\ \ \ \ \ \ \
| * | | | | | | Use wrap_parameters in pipelines controllerGrzegorz Bizon2017-05-051-0/+2
| * | | | | | | Respond with no content for pipeline JSON actionsGrzegorz Bizon2017-05-051-6/+2
| * | | | | | | Retry and cancel endpoints send 204 json response. Request is made with type ...Filipa Lacerda2017-05-051-2/+18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'adam-separate-slash-commands' into 'master' Rémy Coutable2017-05-054-28/+25
|\ \ \ \ \ \ \
| * | | | | | | Display slash commands outcome when previewing Markdownadam-separate-slash-commandsRares Sfirlogea2017-05-044-28/+25
* | | | | | | | Update design of auth error pageAnnabel Dunstone Gray2017-05-051-1/+1
* | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0416-96/+252
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-041-4/+16
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0412-84/+153
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0318-152/+361
| | |\ \ \ \ \ \ \
| | * | | | | | | | Re-wrote to match our docs - still not 100% sure but closer than it wasPhil Hughes2017-04-281-2/+9
| | * | | | | | | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-04-286-9/+60
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/29667-deploy-keys' into deploy-keys-load...Jacob Schatz2017-04-271-2/+7
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Project deploy keys json end pointJarka Kadlecova2017-03-241-2/+7
| * | | | | | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-5/+23
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-5/+23
| * | | | | | | | | | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-043-55/+86
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-023-55/+86
| * | | | | | | | | | | Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master' Rémy Coutable2017-05-043-0/+6
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Disable navigation to Pages config if Pages is disabledMark Fletcher2017-05-043-0/+6
| | |/ / / / / / / / / /
| * | | | | | | | | | | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-042-15/+40
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'dm-artifact-browser-header' into 'master' Robert Speicher2017-05-031-2/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add breadcrumb, build header and pipelines submenu to artifacts browserDouwe Maan2017-05-031-2/+6
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' Sean McGivern2017-05-031-6/+9
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Allow commenting on older versions of the diff and comparisons between diff v...dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-6/+9
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'dm-blob-external-storage' into 'master' Sean McGivern2017-05-031-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-031-1/+1
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch '28408-feature-proposal-include-search-options-to-pipelines-api'...Robert Speicher2017-05-031-5/+5
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | - Add new parameters for Pipeline APIShinya Maeda2017-05-031-5/+5
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-033-3/+60
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fixed failing specsPhil Hughes2017-04-261-4/+4
| | * | | | | | | | Added controller specsPhil Hughes2017-04-261-0/+11
| | * | | | | | | | Fixed feature spec not waiting for ajax request to finishPhil Hughes2017-04-261-1/+1
| | * | | | | | | | Load milestone tabs asynchronouslyPhil Hughes2017-04-263-2/+48
| | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | More updates for translations plus some refactoring.Ruben Davila2017-05-031-9/+5
* | | | | | | | | First round of updates from the code review.Ruben Davila2017-05-023-6/+11
* | | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0227-236/+442
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'metrics-deployment-history' into 'master' Douwe Maan2017-05-021-0/+18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | use represent_concise instead of separate entityPawel Chojnacki2017-04-241-1/+1
| | * | | | | | | | DeploymentsSerializer can serialize arrays properlyPawel Chojnacki2017-04-241-4/+3
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_...Pawel Chojnacki2017-04-2063-511/+763
| | |\ \ \ \ \ \ \ \