summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Disallow NULL values for environments.project_idci-environment-status-performanceYorick Peterse2017-09-133-2/+23
* Constrain environment deployments to project IDsYorick Peterse2017-09-132-1/+9
* Merge branch 'zj-auto-devops-banner' into 'master'Kamil Trzciński2017-09-133-1/+25
|\
| * Fix extra space in YAML arrayZeger-Jan van de Weg2017-09-131-1/+1
| * AutoDevOps banner hidden on explicit CI configZeger-Jan van de Weg2017-09-133-1/+25
* | Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'Rémy Coutable2017-09-132-4/+15
|\ \
| * | Fix: GPG tmp dir removal race conditionAlexis Reigel2017-09-132-4/+15
|/ /
* | Merge branch 'replace_profile_active_tab.feature' into 'master'Rémy Coutable2017-09-138-58/+79
|\ \ | |/ |/|
| * Replace the 'profile/active_tab.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-138-58/+79
* | Merge branch '37629-lazy-image-loading-breaks-notification-mails-for-an-added...Douwe Maan2017-09-134-1/+27
|\ \
| * | Remove ImageLazyLoadFilter from EmailPipeline37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshotRobert Speicher2017-09-124-1/+27
* | | Merge branch 'docs-inherit-milestone-labels-new-mr' into 'master'Douwe Maan2017-09-131-1/+2
|\ \ \
| * | | Automatically inherit the milestone and labels of the issuedocs-inherit-milestone-labels-new-mrVictor Wu2017-09-121-1/+2
| |/ /
* | | Merge branch 'fix-doorkeeper-failure' into 'master'Rémy Coutable2017-09-131-1/+1
|\ \ \
| * | | Fix doorkeeper failureKamil Trzciński2017-09-131-1/+1
|/ / /
* | | Merge branch 'zj-feature-flipper-disable-banner' into 'master'Kamil Trzciński2017-09-134-1/+34
|\ \ \
| * | | Allow all AutoDevOps banners to be disabledZeger-Jan van de Weg2017-09-124-1/+34
* | | | Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-134-0/+16
|\ \ \ \
| * | | | Add auto devops enabled/disabled to usage pingZeger-Jan van de Weg2017-09-123-0/+7
| * | | | Add usage ping for Auto DevOpsZeger-Jan van de Weg2017-09-083-0/+9
* | | | | Merge branch '37405-admin-page-runner-tag-help-update' into 'master'Rémy Coutable2017-09-132-1/+6
|\ \ \ \ \
| * | | | | Add help text to runner edit page that tags should be separated by commas.Brendan O'Leary2017-09-132-1/+6
|/ / / / /
* | | | | Merge branch '36907-new-issue-from-failed-build-no-longer-links-to-failed-bui...Grzegorz Bizon2017-09-133-6/+6
|\ \ \ \ \
| * | | | | Fixed Tests + Reverted Try out from before36907-new-issue-from-failed-build-no-longer-links-to-failed-buildTim Zallmann2017-09-122-2/+3
| * | | | | Implemented the new Description ContentTim Zallmann2017-09-123-3/+2
| * | | | | Changed Var nameTim Zallmann2017-09-121-2/+2
| * | | | | Adapting Test for JobsTim Zallmann2017-09-121-2/+2
| * | | | | Fixed the URL + renamed to Job FailedTim Zallmann2017-09-122-3/+3
* | | | | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-1336-2448/+2465
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | adds changelogMaxim Rydkin2017-09-123-5/+10
| * | | | | move `lib/ci/mask_secret.rb` into `lib/gitlab/ci/mask_secret.rb`Maxim Rydkin2017-09-125-13/+15
| * | | | | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-129-1956/+1960
| * | | | | move `lib/ci/model.rb` into `lib/gitlab/ci/model.rb`Maxim Rydkin2017-09-1213-22/+24
| * | | | | move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`Maxim Rydkin2017-09-124-122/+124
| * | | | | move `lib/ci/ansi2html.rb` into `lib/gitlab/ci/ansi2html.rb`Maxim Rydkin2017-09-124-334/+336
* | | | | | Merge branch 'rs-remove-bad-foreground-migration' into 'master'Stan Hu2017-09-121-57/+0
|\ \ \ \ \ \
| * | | | | | Remove db/migrate/20170828135939_migrate_user_external_mail_data.rbRobert Speicher2017-09-121-57/+0
* | | | | | | Merge branch 'patch-25' into 'master'Stan Hu2017-09-121-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Improve formatting of pgloader lineStan Hu2017-09-121-1/+1
| * | | | | | Update mysql_to_postgresql.md to deprecate these docs in favor of PGLoaderLee Matos2017-09-121-0/+2
* | | | | | | Merge branch '37730-image-onion-skin-does-not-work-anymore' into 'master'Clement Ho2017-09-122-4/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Resolve "Image onion skin + swipe does not work anymore"Tim Zallmann2017-09-122-4/+9
|/ / / / / /
* | | | | | Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-1233-111/+648
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-1133-111/+648
* | | | | | | Merge branch 'docs/autodevops-fixes' into 'master'Achilleas Pipinellis2017-09-121-19/+61
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix Auto DevOps quick start guideAchilleas Pipinellis2017-09-121-19/+61
|/ / / / / /
* | | | | | Merge branch '31358_decrease_perceived_complexity_threshold_step2' into 'master'Robert Speicher2017-09-123-13/+26
|\ \ \ \ \ \
| * | | | | | Decrease Perceived Complexity threshold to 15Maxim Rydkin2017-09-123-13/+26
|/ / / / / /
* | | | | | Merge branch '31362_decrease_cyclomatic_complexity_threshold_step4' into 'mas...Robert Speicher2017-09-124-20/+42
|\ \ \ \ \ \
| * | | | | | Decrease Cyclomatic Complexity threshold to 13Maxim Rydkin2017-09-124-20/+42
|/ / / / / /