summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rename Gitlab::Git::Committer to Usergitlab-git-userJacob Vosmaer2017-09-147-28/+34
|
* 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
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078
| * | | | | | adds changelogMaxim Rydkin2017-09-123-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix CI fix CI
| * | | | | | 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.rb See merge request !14240
| * | | | | | | Remove db/migrate/20170828135939_migrate_user_external_mail_data.rbRobert Speicher2017-09-121-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is a duplicate of a post-deploy migration and appears to have been left in by mistake. Looping through the Users table in a foreground migration would've been a bad idea. [ci skip]
* | | | | | | | Merge branch 'patch-25' into 'master'Stan Hu2017-09-121-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update mysql_to_postgresql.md to deprecate these docs in favor of PGLoader See merge request !14238
| * | | | | | | 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" Closes #37730 and #37732 See merge request !14215
| * | | | | | | Resolve "Image onion skin + swipe does not work anymore"Tim Zallmann2017-09-122-4/+9
|/ / / / / / /