summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 42611-removed-branch-linkFilipa Lacerda2018-10-081538-7517/+15183
|\
| * Render log artifact files in GitLabZeger-Jan van de Weg2018-10-081-1/+1
| * Merge branch 'bw-fix-checking-disabled-services' into 'master'51761-create-new-project-auto-populate-project-slug-string-to-project-name-if-name-is-empty34758-split-create-gcp-controllerStan Hu2018-10-061-3/+3
| |\
| | * Check disabled_services when finding a serviceBrett Walker2018-10-061-3/+3
| * | Fix invalid parent path on group settings pageDmitriy Zaporozhets2018-10-061-2/+2
| * | Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís2018-10-0615-50/+123
| |/
| * Add button to insert table in markdown editorGeorge Tsiolis2018-10-062-0/+18
| * Merge branch 'backport-ce-to-ee-merge' into 'master'Stan Hu2018-10-061-5/+6
| |\
| | * Fix CE to EE merge (backport)Kamil Trzciński2018-10-051-5/+6
| * | Update operations metrics empty stateGeorge Tsiolis2018-10-061-9/+9
| * | Fix LFS uploaded images not being renderedOswaldo Ferreira2018-10-053-1/+12
| * | Merge branch 'ee-7126-admin-projects-geo-status' into 'master'Douglas Barbosa Alexandre2018-10-051-0/+2
| |\ \
| | * | Prepare admin/projects/show view to allow EE specific featureGabriel Mazetto2018-10-051-0/+2
| * | | Add timed incremental rollout to Auto DevOpsAlessio Caiazza2018-10-052-6/+23
| |/ /
| * | Merge branch '43109-ci_environments_status-json-executes-more-than-100-querie...Sean McGivern2018-10-052-20/+19
| |\ \
| | * | Don't build project services unneccesarilyBrett Walker2018-10-042-20/+19
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqBob Van Landuyt2018-10-054-14/+22
| |\ \ \
| | * \ \ Merge branch 'security-bw-confidential-titles-through-markdown-api' into 'mas...Bob Van Landuyt2018-10-051-1/+1
| | |\ \ \
| | | * | | post_process markdown redered by APIBrett Walker2018-09-291-1/+1
| | * | | | Merge branch 'security-fix-leaking-private-project-namespace' into 'master'Bob Van Landuyt2018-10-052-12/+20
| | |\ \ \ \
| | | * | | | Filter system notes with public and private cross referencesBrett Walker2018-10-022-12/+20
| | * | | | | Merge branch 'security-osw-user-info-leak-discussions' into 'master'Bob Van Landuyt2018-10-051-1/+1
| | |\ \ \ \ \
| | | * | | | | Filter user sensitive data from discussions JSONOswaldo Ferreira2018-10-011-1/+1
| | | | |/ / / | | | |/| | |
| * | | | | | Merge branch 'issue_43097' into 'master'Sean McGivern2018-10-053-19/+27
| |\ \ \ \ \ \
| | * | | | | | Move issue related_branches to serviceFelipe Artur2018-10-043-19/+27
| * | | | | | | Merge branch 'ce-5987-project-templates-api' into 'master'Robert Speicher2018-10-0514-123/+122
| |\ \ \ \ \ \ \
| | * | | | | | | Backport project template API to CENick Thomas2018-10-0514-123/+122
| * | | | | | | | Merge branch 'sh-revert-broken-deploy-key-change' into 'master'Robert Speicher2018-10-051-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Merge branch 'deploy-tokens' into 'master'"Stan Hu2018-10-051-2/+2
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'scheduled-manual-jobs' into 'master'Kamil Trzciński2018-10-0533-81/+310
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0531-142/+326
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Make sure remaining time of scheduled jobs is positive in pipelines listWinnie Hellmann2018-10-051-2/+7
| | * | | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0589-448/+1154
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add component tests for scheduled job frontendWinnie Hellmann2018-10-043-4/+5
| | * | | | | | | | | | Make Ci::Stage status transition event consistent with Ci::PipelineShinya Maeda2018-10-041-2/+2
| | * | | | | | | | | | Enable ci_enable_scheduled_build feature flag by defaultShinya Maeda2018-10-041-1/+1
| | * | | | | | | | | | Guard against missing manual actions / scheduled jobs in pipelines rowWinnie Hellmann2018-10-041-1/+8
| | * | | | | | | | | | Display confirmation only when triggering scheduled jobs not manualWinnie Hellmann2018-10-041-5/+7
| | * | | | | | | | | | Rename event :schedule to event :delay in Ci::Pipeline to avoid conflicts wit...Shinya Maeda2018-10-041-2/+2
| | * | | | | | | | | | Revert "Avoid conflicts between enumlator's schedule! method and state machin...Shinya Maeda2018-10-043-3/+3
| | * | | | | | | | | | Avoid conflicts between enumlator's schedule! method and state machine's sche...Shinya Maeda2018-10-043-3/+3
| | * | | | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0478-1264/+1461
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Improve performance of stale scheduled builds searchShinya Maeda2018-10-031-28/+12
| | * | | | | | | | | | | Add job_entity_specShinya Maeda2018-10-031-1/+9
| | * | | | | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0316-23/+97
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add confirmation for immediately starting scheduled jobsWinnie Hellmann2018-10-022-4/+14
| | * | | | | | | | | | | | enqueue in process_build_serviceShinya Maeda2018-10-021-1/+5
| | * | | | | | | | | | | | Show sheculed label for present and past jobsShinya Maeda2018-10-021-3/+3
| | * | | | | | | | | | | | Rename failure reason to stale_scheduleShinya Maeda2018-10-023-3/+3
| | * | | | | | | | | | | | Add badge for scheduled jobsWinnie Hellmann2018-10-021-0/+2