Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Demonstrate <details> and <summary> tags in doc/user/markdown.mdjej/demonstrate-details-summary | James Edwards-Jones | 2017-09-15 | 1 | -0/+24 |
| | |||||
* | Merge branch ↵ | Douwe Maan | 2017-09-13 | 4 | -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-screenshot | Robert Speicher | 2017-09-12 | 4 | -1/+27 |
| | | |||||
* | | Merge branch 'docs-inherit-milestone-labels-new-mr' into 'master' | Douwe Maan | 2017-09-13 | 1 | -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-mr | Victor Wu | 2017-09-12 | 1 | -1/+2 |
| |/ | |||||
* | | Merge branch 'fix-doorkeeper-failure' into 'master' | Rémy Coutable | 2017-09-13 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix the Doorkeeper.optional_scopes issue triggered by !13314 Closes #37753 See merge request !14219 | ||||
| * | | Fix doorkeeper failure | Kamil Trzciński | 2017-09-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'zj-feature-flipper-disable-banner' into 'master' | Kamil Trzciński | 2017-09-13 | 4 | -1/+34 |
|\ \ | | | | | | | | | | | | | | | | | | | Allow all AutoDevOps banners to be disabled Closes #37653 See merge request !14218 | ||||
| * | | Allow all AutoDevOps banners to be disabled | Zeger-Jan van de Weg | 2017-09-12 | 4 | -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ński | 2017-09-13 | 4 | -0/+16 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add usage ping for Auto DevOps Closes #37648 See merge request !14162 | ||||
| * | | | Add auto devops enabled/disabled to usage ping | Zeger-Jan van de Weg | 2017-09-12 | 3 | -0/+7 |
| | | | | |||||
| * | | | Add usage ping for Auto DevOps | Zeger-Jan van de Weg | 2017-09-08 | 3 | -0/+9 |
| | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#37648 | ||||
* | | | | Merge branch '37405-admin-page-runner-tag-help-update' into 'master' | Rémy Coutable | 2017-09-13 | 2 | -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'Leary | 2017-09-13 | 2 | -1/+6 |
|/ / / / | |||||
* | | | | Merge branch ↵ | Grzegorz Bizon | 2017-09-13 | 3 | -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-build | Tim Zallmann | 2017-09-12 | 2 | -2/+3 |
| | | | | | |||||
| * | | | | Implemented the new Description Content | Tim Zallmann | 2017-09-12 | 3 | -3/+2 |
| | | | | | |||||
| * | | | | Changed Var name | Tim Zallmann | 2017-09-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Adapting Test for Jobs | Tim Zallmann | 2017-09-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fixed the URL + renamed to Job Failed | Tim Zallmann | 2017-09-12 | 2 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master' | Grzegorz Bizon | 2017-09-13 | 36 | -2448/+2465 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078 | ||||
| * | | | | | adds changelog | Maxim Rydkin | 2017-09-12 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix CI fix CI | ||||
| * | | | | | move `lib/ci/mask_secret.rb` into `lib/gitlab/ci/mask_secret.rb` | Maxim Rydkin | 2017-09-12 | 5 | -13/+15 |
| | | | | | | |||||
| * | | | | | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb` | Maxim Rydkin | 2017-09-12 | 9 | -1956/+1960 |
| | | | | | | |||||
| * | | | | | move `lib/ci/model.rb` into `lib/gitlab/ci/model.rb` | Maxim Rydkin | 2017-09-12 | 13 | -22/+24 |
| | | | | | | |||||
| * | | | | | move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb` | Maxim Rydkin | 2017-09-12 | 4 | -122/+124 |
| | | | | | | |||||
| * | | | | | move `lib/ci/ansi2html.rb` into `lib/gitlab/ci/ansi2html.rb` | Maxim Rydkin | 2017-09-12 | 4 | -334/+336 |
| | | | | | | |||||
* | | | | | | Merge branch 'rs-remove-bad-foreground-migration' into 'master' | Stan Hu | 2017-09-12 | 1 | -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.rb | Robert Speicher | 2017-09-12 | 1 | -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 Hu | 2017-09-12 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Update mysql_to_postgresql.md to deprecate these docs in favor of PGLoader See merge request !14238 | ||||
| * | | | | | | Improve formatting of pgloader line | Stan Hu | 2017-09-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Update mysql_to_postgresql.md to deprecate these docs in favor of PGLoader | Lee Matos | 2017-09-12 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch '37730-image-onion-skin-does-not-work-anymore' into 'master' | Clement Ho | 2017-09-12 | 2 | -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 Zallmann | 2017-09-12 | 2 | -4/+9 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'revert-2f46c3a8' into 'master' | Robert Speicher | 2017-09-12 | 33 | -111/+648 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'" See merge request !14190 | ||||
| * | | | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8 | Annabel Dunstone Gray | 2017-09-11 | 33 | -111/+648 |
| | | | | | | | | | | | | | | | | | | | | | This reverts merge request !14148 | ||||
* | | | | | | | Merge branch 'docs/autodevops-fixes' into 'master' | Achilleas Pipinellis | 2017-09-12 | 1 | -19/+61 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Auto DevOps quick start guide Closes #37768 See merge request !14230 | ||||
| * | | | | | | Fix Auto DevOps quick start guide | Achilleas Pipinellis | 2017-09-12 | 1 | -19/+61 |
|/ / / / / / | |||||
* | | | | | | Merge branch '31358_decrease_perceived_complexity_threshold_step2' into 'master' | Robert Speicher | 2017-09-12 | 3 | -13/+26 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decrease Perceived Complexity threshold to 15 See merge request !14160 | ||||
| * | | | | | | Decrease Perceived Complexity threshold to 15 | Maxim Rydkin | 2017-09-12 | 3 | -13/+26 |
|/ / / / / / | |||||
* | | | | | | Merge branch '31362_decrease_cyclomatic_complexity_threshold_step4' into ↵ | Robert Speicher | 2017-09-12 | 4 | -20/+42 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Decrease Cyclomatic Complexity threshold to 13 See merge request !14152 | ||||
| * | | | | | | Decrease Cyclomatic Complexity threshold to 13 | Maxim Rydkin | 2017-09-12 | 4 | -20/+42 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'gitaly-519-commit-stats' into 'master' | Robert Speicher | 2017-09-12 | 5 | -3/+61 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::CommitStats to Gitaly Closes gitaly#519 See merge request !14077 | ||||
| * | | | | | | Migrate Git::CommitStats to Gitalygitaly-519-commit-stats | Kim "BKC" Carlbäcker | 2017-09-11 | 5 | -3/+61 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'rs-dev-email-docs' into 'master' | Rémy Coutable | 2017-09-12 | 2 | -0/+24 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | Add developer documentation about working with sent emails and previews See merge request !14227 | ||||
| * | | | | | | Add developer documentation about working with sent emails and previews | Robert Speicher | 2017-09-12 | 2 | -0/+24 |
|/ / / / / / | |||||
* | | | | | | Merge branch '37025-error-500-in-non-utf8-branch-names' into 'master' | Rémy Coutable | 2017-09-12 | 5 | -2/+30 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error 500 in non-UTF8 branch names" This could potentially "duplicate" branches on the UI, but it prevents 500 errors. The real issue here is the fact that a branch name with a invalid UTF-8 characters. Closes #37025 See merge request !14090 | ||||
| * | | | | | | Resolve "Error 500 in non-UTF8 branch names" | Micael Bergeron | 2017-09-12 | 5 | -2/+30 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'breadcrumbs-hover-underline' into 'master' | Filipa Lacerda | 2017-09-12 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the breadcrumbs project name not having hover style Closes #37661 See merge request !14211 | ||||
| * | | | | | | Fixed the breadcrumbs project name not having hover stylebreadcrumbs-hover-underline | Phil Hughes | 2017-09-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #37661 |