summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add initial FE supportfe-support-multi-line-suggestionsOswaldo Ferreira2019-02-285-30/+161
|
* Add multi-line suggestions backend changesOswaldo Ferreira2019-02-2812-59/+294
|
* Merge branch '20084-update-the-spinner-component' into 'master'Fatih Acet2019-02-283-0/+57
|\ | | | | | | | | | | | | Resolve "Update the spinner component" Closes #20084 See merge request gitlab-org/gitlab-ce!25186
| * Add CSS needed for new spinnerBrandon Labuschagne2019-02-283-0/+57
|/ | | | | The new spinner is purely CSS It is used for the loading_icon gitlab-ui component
* Merge branch '56863-system-messages-in-email' into 'master'Douglas Barbosa Alexandre2019-02-2830-22/+420
|\ | | | | | | | | | | | | Show header and footer system messages in email Closes #56863 See merge request gitlab-org/gitlab-ce!25474
| * Show header and footer system messages in emailAlexandru Croitor2019-02-2730-22/+420
| | | | | | | | | | | | | | | | | | | | | | * Add email_header_and_footer_enabled flag to appearances table * Set email_header_and_footer_enabled default value to false * Add checkbox to appearance to toggle show header and footer in emails * Add email_header_and_footer_enabled to allowed params in controller * Add header and footer messages to the html and text email layouts * Remove the color styling for emails header and footer * Add empty_mailer layout for emails without layout, to have the header and footer applied
* | Merge branch 'ee-component-docs' into 'master'Filipa Lacerda2019-02-281-0/+23
|\ \ | | | | | | | | | | | | Add docs for EE components in CE components See merge request gitlab-org/gitlab-ce!25649
| * | Add docs for EE components in CE componentsPhil Hughes2019-02-281-0/+23
| | |
* | | Merge branch 'leipert-upgrade-jest' into 'master'Phil Hughes2019-02-284-1077/+558
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade jest and related dependencies Closes #54834 See merge request gitlab-org/gitlab-ce!25597
| * | | Upgrade jest and related dependenciesLukas Eipert2019-02-284-1077/+558
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes other outdated babel@6 dependencies as well. Unfortunately the newer version of vue-jest has a dependency of an older version of ts-jest. In order to satisfy the peerDependency from ts-jest, we are forcing the version@24. The only "breaking" change from ts-jest 23->24 is that it requires a newer version of jest. This might be obsolete soon, as vue-jest plans on switching to babel eventually.
* | | | Merge branch 'noteable-discussion-ee-differences-ce' into 'master'Filipa Lacerda2019-02-285-2/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE port of noteable-discussion-ee-differences See merge request gitlab-org/gitlab-ce!25638
| * | | | CE port of noteable-discussion-ee-differencesPhil Hughes2019-02-285-2/+31
| | |/ / | |/| |
* | | | Merge branch 'patch-31' into 'master'Douwe Maan2019-02-281-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update best_practices.md let section to also reference let! variables. See merge request gitlab-org/gitlab-ce!22496
| * | | | Update best_practices.md let section to also reference let! variables.Artur Martsinkovskyi2018-10-191-4/+8
| | | | |
* | | | | Merge branch 'qa-de-quarantine-oauth-tests' into 'master'Rémy Coutable2019-02-281-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Revert "Quarantine GitHub OAuth test" Closes gitlab-org/quality/nightly#83 See merge request gitlab-org/gitlab-ce!25636
| * | | | Revert "Quarantine GitHub OAuth test"Sanad Liaquat2019-02-281-2/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 970576c5c6a94edd93dd822ede7b82e73c71fea9.
* | | | | Merge branch 'web-ide-default-merge-request' into 'master'Nick Thomas2019-02-283-4/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Web IDE path for merge request edit buttons See merge request gitlab-org/gitlab-ce!25595
| * | | | | Use Web IDE path for merge request edit buttonsPhil Hughes2019-02-273-4/+10
| | | | | |
* | | | | | Merge branch '57788-project-labels-tooltip-missing' into 'master'Clement Ho2019-02-283-4/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where project topics truncate Closes #57788 See merge request gitlab-org/gitlab-ce!25398
| * | | | | | Fix bug where project topics truncateBrandon Labuschagne2019-02-283-4/+20
|/ / / / / /
* | | | | | Merge branch 'enable-perf-in-mr' into 'master'Rémy Coutable2019-02-282-0/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling performance metrics on Review Apps Closes #57881 See merge request gitlab-org/gitlab-ce!25549
| * | | | | | Enabling performance metrics on Review AppsRamya Authappan2019-02-282-0/+22
|/ / / / / /
* | | | | | Merge branch 'apollo-package-upgrades' into 'master'Filipa Lacerda2019-02-282-61/+61
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Update apollo libraries See merge request gitlab-org/gitlab-ce!25608
| * | | | | Update apollo librariesPhil Hughes2019-02-272-61/+61
| |/ / / /
* | | | | Merge branch 'add-project-level-config-for-prospective-merge-pipelines-ce' ↵Filipa Lacerda2019-02-284-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Backport: Add project level config for merge pipelines See merge request gitlab-org/gitlab-ce!25385
| * | | | | Add project level config for merge pipelinesShinya Maeda2019-02-284-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add schema Add CE counter part Add default value for Add changelog Fix schema Add test Fix schema Fix schema version Remove default value for
* | | | | | Merge branch 'mr-origin-24925' into 'master'Sean McGivern2019-02-284-6/+16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Jira: make issue links title compact See merge request gitlab-org/gitlab-ce!25609
| * | | | | Jira: Make issue links title compactDouglas Barbosa Alexandre2019-02-284-6/+16
|/ / / / / | | | | | | | | | | | | | | | Port of a community contribution from @glensc to upstream.
* | | | | Merge branch 'sh-redash-is-baaaaaack' into 'master'Rémy Coutable2019-02-282-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bring back mentions of Redash See merge request gitlab-org/gitlab-ce!25618
| * | | | | Bring back mentions of RedashStan Hu2019-02-272-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 676e0a3260a216d72131aa963f421c02042b93c1. It was removed when we thought we were moving to Looker.
* | | | | | Merge branch '55505-mr-diff-karma-tests' into 'master'Phil Hughes2019-02-288-30/+436
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add missing karma tests to the the MR Diff components" Closes #55505 See merge request gitlab-org/gitlab-ce!24733
| * | | | | | Resolve "Add missing karma tests to the the MR Diff components"Natalia Tepluhina2019-02-288-30/+436
|/ / / / / /
* | | | | | Merge branch 'qa-nightly-83-quarantine-oauth-specs' into 'master'Ramya Authappan2019-02-281-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine GitHub OAuth tests See merge request gitlab-org/gitlab-ce!25631
| * | | | | | Quarantine GitHub OAuth testSanad Liaquat2019-02-281-1/+2
| | | | | | |
* | | | | | | Merge branch 'root_controller_gitaly_allow_n_1' into 'master'Stan Hu2019-02-281-1/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Allow Gitaly N+1 calls for RootController#index See merge request gitlab-org/gitlab-ce!25514
| * | | | | | Allow Gitaly N+1 calls for RootController#indexThong Kuah2019-02-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow developers to load GitLab root page locally without errors. Since we know this issue for a while now, no point letting the exception be triggered constantly.
* | | | | | | Merge branch 'docs/add-efs-warning' into 'master'Evan Read2019-02-281-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add EFS warning message for AWS installs See merge request gitlab-org/gitlab-ce!25498
| * | | | | | | Docs: Add EFS warning message for AWS installsDavid Coy2019-02-281-0/+4
|/ / / / / / /
* | | | | | | Merge branch '52877-ios-publishing-blog-post-and-gitlab-ci-yml-template' ↵Nick Thomas2019-02-282-0/+33
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add iOS-fastlane template for .gitlab-ci.yml Closes #52877 See merge request gitlab-org/gitlab-ce!25395
| * | | | | | Add iOS-fastlane template for .gitlab-ci.ymlJason Lenny2019-02-282-0/+33
|/ / / / / /
* | | | | | Merge branch 'an-developer-docs-for-distributed-tracing' into 'master'Evan Read2019-02-284-0/+183
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add developer documentation for distributing tracing See merge request gitlab-org/gitlab-ce!25150
| * | | | | | Add developer documentation for distributing tracingAndrew Newdigate2019-02-284-0/+183
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This change adds developer documentation on using distributed tracing using Jaeger.
* | | | | | Merge branch 'stylelint-breaking-master' into 'master'Luke Bennett2019-02-271-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adhere to stylelint specs See merge request gitlab-org/gitlab-ce!25620
| * | | | | | Adhere to stylelint specsAnnabel Dunstone Gray2019-02-271-9/+9
|/ / / / / /
* | | | | | Merge branch 'tz-stylelint-episode-2' into 'master'Annabel Dunstone Gray2019-02-2752-423/+443
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | More Stylelint rules See merge request gitlab-org/gitlab-ce!25266
| * | | | | | Added Stylelint SetupTim Zallmann2019-02-2553-425/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added stylelint to static-analysis Updated yarn dependencies CSS Fixes and rule adoptions of stylelint Added stylelint-scss Deduplicated yarn.lock to clear dependencies First round of advanced stylelint rules Mainly Vendor prefix updates related to flex Updates to more webkit specific vendor prefixes Finished all vendor specific fixes Moved now 4 rules to warning Fixed the new scss lint problems More stylelint adaptions after rebase
* | | | | | | Merge branch 'feature/runner-tag-filter-for-admin-view' into 'master'Stan Hu2019-02-2721-80/+419
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Feature: Runner tag filter for admin view See merge request gitlab-org/gitlab-ce!19740
| * | | | | | make assertions on objects instead of tag namesAlexis Reigel2019-02-271-12/+12
| | | | | | |
| * | | | | | use functional style for tags finderAlexis Reigel2019-02-271-19/+19
| | | | | | |
| * | | | | | add trigram database index on tagsAlexis Reigel2019-02-272-0/+19
| | | | | | |
View Lorry Controller Status