summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove animate.js and the issuable label pulse animation.refactor-animate-jsBryce Johnson2017-09-134-57/+5
| | | | Nobody tell @jschatz1 :P
* Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-132-4/+30
|\ | | | | | | | | Backport more EE changes to Gitlab::UrlSanitizer See merge request !14150
| * Backport more EE changes to Gitlab::UrlSanitizerNick Thomas2017-09-112-4/+30
| |
* | Merge branch 'revert-373ff978' into 'master'Stan Hu2017-09-131-0/+57
|\ \ | | | | | | | | | | | | Revert "Merge branch 'rs-remove-bad-foreground-migration' into 'master'" See merge request !14253
| * | Revert "Merge branch 'rs-remove-bad-foreground-migration' into 'master'"Robert Speicher2017-09-131-0/+57
| | | | | | | | | This reverts merge request !14240
* | | Merge branch 'docs-gitaly-client-config' into 'master'Achilleas Pipinellis2017-09-131-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix Ruby syntax error in Gitaly config example See merge request !14208
| * | | Fix Ruby syntax error in Gitaly config exampledocs-gitaly-client-configJacob Vosmaer2017-09-121-2/+2
| | | |
* | | | Merge branch 'ce-backport-new-sidebar-boards' into 'master'Filipa Lacerda2017-09-133-8/+24
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | CE backport of new-sidebar-boards See merge request !14246
| * | | CE backport of new-sidebar-boardsce-backport-new-sidebar-boardsPhil Hughes2017-09-133-8/+24
| | | |
* | | | Merge branch 'sh-exclude-api-responses' into 'master'Robert Speicher2017-09-131-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Exclude logging of API responses to prevent leakage of confidential data See merge request !14245
| * | | | Exclude logging of API responses to prevent leakage of confidential datash-exclude-api-responsesStan Hu2017-09-131-1/+0
| | | | |
* | | | | Merge branch 'backstage/gb/optimize-some-specs-with-rspec-set' into 'master'Rémy Coutable2017-09-138-41/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Optimize some tests with RSpec Set See merge request !14047
| * | | | | Fix job coverage specsbackstage/gb/optimize-some-specs-with-rspec-setGrzegorz Bizon2017-09-131-1/+1
| | | | | |
| * | | | | Fix build specs after using `set` instead of `let`Grzegorz Bizon2017-09-131-13/+22
| | | | | |
| * | | | | Fix syntax error in LFS objects specsGrzegorz Bizon2017-09-131-1/+1
| | | | | |
| * | | | | Optimize CI/CD build retry service specsGrzegorz Bizon2017-09-131-4/+5
| | | | | |
| * | | | | Optimize CI/CD build model specsGrzegorz Bizon2017-09-131-8/+5
| | | | | |
| * | | | | Optimize generic specs for servicesGrzegorz Bizon2017-09-131-6/+7
| | | | | |
| * | | | | Optimize a few simple spec files by using `set`Grzegorz Bizon2017-09-134-6/+9
| | | | | |
| * | | | | Optimize LFS objects specsGrzegorz Bizon2017-09-131-4/+11
| | | | | |
* | | | | | Merge branch 'refactor-monitoring-service' into 'master'Phil Hughes2017-09-133-54/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor MonitoringService class See merge request !14003
| * | | | | | Refactor MonitoringService classMike Greiling2017-09-133-54/+61
|/ / / / / /
* | | | | | Merge branch 'patch-26' into 'master'Rémy Coutable2017-09-131-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete duplicated lines. See merge request !14180
| * | | | | | Delete duplicated lines.Shinichi Maeshima2017-09-111-3/+0
| | | | | | |
* | | | | | | Merge branch '18308-escape-characters' into 'master'Rémy Coutable2017-09-133-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape characters in git user name Closes #18308 See merge request !14020
| * | | | | | | escape characters in git user nameBrandon Everett2017-09-133-1/+17
|/ / / / / / /
* | | | | | | Merge branch ↵Kamil Trzciński2017-09-133-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables' into 'master' Fix `ci_builds` to have an associated `trigger_request_id` See merge request !14244
| * | | | | | | Add change log. Fix spec.fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variablesShinya Maeda2017-09-132-1/+7
| | | | | | | |
| * | | | | | | Fix PipelineTriggerService to associate trigger_request with buildsShinya Maeda2017-09-132-1/+3
| | | | | | | |
* | | | | | | | Merge branch 'zj-auto-devops-banner' into 'master'Kamil Trzciński2017-09-133-1/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AutoDevOps banner hidden on explicit CI config Closes #37652 See merge request !14207
| * | | | | | | | 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
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends the helper method to no show the banner as soon as the project has a `.gitlab-ci.yml` file on the default branch. Fixes gitlab-org/gitlab-ce#37652
* | | | | | | | Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'Rémy Coutable2017-09-132-4/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: GPG tmp dir removal race condition Ignore any errors when removing the tmp directory, as we may run into a race condition: The `gpg-agent` agent process may clean up some files as well while `FileUtils.remove_entry` is iterating the directory and removing all its contained files and directories recursively, which could raise an error. Closes #36998 See merge request !14194
| * | | | | | | | 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 analog See merge request !14239
| * | | | | | | Replace the 'profile/active_tab.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-138-58/+79
| |/ / / / / /
* | | | | | | Merge branch ↵Douwe Maan2017-09-134-1/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshot' into 'master' Resolve "Lazy image loading breaks notification mails for an added screenshot" Closes #37629 See merge request !14161
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Docs for automatically inherit the milestone and labels of the issue See merge request !14223
| * | | | | | 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 the Doorkeeper.optional_scopes issue triggered by !13314 Closes #37753 See merge request !14219
| * | | | | | 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 disabled Closes #37653 See merge request !14218
| * | | | | | Allow all AutoDevOps banners to be disabledZeger-Jan van de Weg2017-09-124-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the default in the development and production environment is false, the negation of enabling is used in the flag to signal you'd turn it off. It reads a bit awkward, but makes us have a migration less. Fixes gitlab-org/gitlab-ce#37653
* | | | | | | Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-134-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add usage ping for Auto DevOps Closes #37648 See merge request !14162
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#37648
* | | | | | | | 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. Closes #37405 See merge request !14224
| * | | | | | | | Add help text to runner edit page that tags should be separated by commas.Brendan O'Leary2017-09-132-1/+6
|/ / / / / / / /
* | | | | | | | Merge branch ↵Grzegorz Bizon2017-09-133-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36907-new-issue-from-failed-build-no-longer-links-to-failed-build' into 'master' Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request !13790