summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'fix-inconsistent-behavior-of-has-ref' into 'master'Kamil Trzciński2019-03-015-5/+146
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Fix inconsistent `branch?` behavior between Ci::Pipeline and Ci::Build See merge request gitlab-org/gitlab-ce!25629
| * | | | | Fix inconsistent `branch?` behaviorShinya Maeda2019-03-015-5/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between Ci::Pipeline and Ci::Build Add spec Add more tests ok
* | | | | | Merge branch '54643-lower_issuable_finder_complexity' into 'master'Sean McGivern2019-03-014-48/+56
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssuableFinder - Always use CTE for group counts Closes #54643 See merge request gitlab-org/gitlab-ce!25411
| * | | | | Always use CTE for IssuableFinder countsMario de la Ossa2019-02-284-48/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the CTE is faster than a subquery and the only reason we're using a subquery is that the CTE can't handle sorting by certain attributes, let's use the CTE always (when the feature flag is enabled) when counting, since we can ignore ordering if we just want a count of results.
* | | | | | Merge branch 'docs-qa-gdk-ssh-setup-link' into 'master'Ramya Authappan2019-03-011-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Link to instructions to run SSH tests on GDK See merge request gitlab-org/gitlab-ce!25661
| * | | | | Link to instructions to run SSH tests on GDKMark Lapierre2019-02-281-0/+3
| | | | | |
* | | | | | Merge branch 'rs-fix-time-based-broken-master' into 'master'Fatih Acet2019-03-011-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Freeze date in merge request status view spec See merge request gitlab-org/gitlab-ce!25671
| * | | | | | Freeze date in merge request status view specRobert Speicher2019-02-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when this spec ran on the 28th of February, "one month ago" isn't actually a month ago, it's "28 days ago". Now we freeze the date to one that works as intended, since the point of the test is only that it shows a relative date in the tooltip, not necessarily that it's an exact, specific date.
* | | | | | | Merge branch 'docs-adjust-condev-md-for-clarity' into 'master'Evan Read2019-03-011-7/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update convdev.md for clarity See merge request gitlab-org/gitlab-ce!25626
| * | | | | | | Update convdev.md for claritycaleb2019-02-271-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarified how instance statistics are presented.
* | | | | | | | Merge branch 'mk/fix-old-feature-flags-link-docs' into 'master'Evan Read2019-03-011-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Replace issue with a link to the feature See merge request gitlab-org/gitlab-ce!25670
| * | | | | | | | Replace issue with a link to the featureMichael Kozono2019-03-011-2/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs-jupyter-seo' into 'master'Evan Read2019-03-011-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase jupyter seo See merge request gitlab-org/gitlab-ce!25663
| * | | | | | | | Increase jupyter seoDaniel Gruesso2019-02-281-1/+5
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs/docs-grammer-manual-job' into 'master'Evan Read2019-03-011-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor grammar update See merge request gitlab-org/gitlab-ce!25643
| * | | | | | | | Minor grammar updateBrendan O'Leary 🐢2019-03-011-3/+3
|/ / / / / / / /
* | | | | | | | Merge branch '57734-improve-label-dropdown-selection-performance' into 'master'Fatih Acet2019-03-013-29/+26
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve labels select rendering Closes #48230 and #57734 See merge request gitlab-org/gitlab-ce!25281
| * | | | | | | Remove jQuery overhead in labels select renderingHeinrich Lee Yu2019-02-271-11/+18
| | | | | | | |
| * | | | | | | Improve glDropdown rendering performanceHeinrich Lee Yu2019-02-273-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return jQuery element instead of HTML for renderRow for labels select
* | | | | | | | Merge branch '53413-externalize-markdown-toolbar-tooltips' into 'master'Fatih Acet2019-03-015-54/+64
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize markdown toolbar tooltips Closes #53413 See merge request gitlab-org/gitlab-ce!25529
| * | | | | | | | Externalize markdown toolbar tooltipsEnrique Alcántara2019-03-015-54/+64
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace tooltip texts in the markdown toolbar with bindings to gettext calls Author: Enrique Alcantara <enrique@crunch.io>
* | | | | | | | Merge branch 'winh-note_form_spec-vue-test-utils' into 'master'Fatih Acet2019-03-011-59/+98
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor note_form_spec.js to use Vue test utils See merge request gitlab-org/gitlab-ce!25571
| * | | | | | | | Refactor note_form_spec.js to use Vue test utilsWinnie Hellmann2019-02-281-59/+98
| | | | | | | | |
* | | | | | | | | Merge branch '40396-use-pgroups-for-background-jobs' into 'master'Stan Hu2019-02-283-3/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bin/background_jobs: use pgroups Closes #40396 See merge request gitlab-org/gitlab-ce!25654
| * | | | | | | | | bin/background_jobs: use pgroupsNick Thomas2019-02-283-3/+17
| | | | | | | | | |
* | | | | | | | | | Merge branch '40396-remove-unneeded-restart-code' into 'master'Robert Speicher2019-02-286-247/+133
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an obsolete workaround for GRPC unavailable errors See merge request gitlab-org/gitlab-ce!25645
| * | | | | | | | | | Revert "Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed"Nick Thomas2019-02-286-247/+133
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 006753110a462e62f549cdf3c410e73eed068dbf.
* | | | | | | | | | Merge branch '58362-broken-master-due-to-stylelint-errors' into 'master'Annabel Dunstone Gray2019-02-281-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Broken master due to stylelint errors" Closes #58362 See merge request gitlab-org/gitlab-ce!25662
| * | | | | | | | | Fix broken master issue due to stylelint errorsFatih Acet2019-02-281-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'qa-dd-refactor-autodevops-spec' into 'master'Dan Davison2019-02-282-129/+114
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pare down create_project_with_auto_devops_spec See merge request gitlab-org/gitlab-ce!25577
| * | | | | | | | | Default rbac to true for the KubernetesCluster Serviceddavison2019-02-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: ddavison <ddavison@gitlab.com>
| * | | | | | | | | Pare down create_project_with_auto_devops_specddavison2019-02-261-128/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now only test RBAC disabled Remove superfluous statements that waste time Signed-off-by: ddavison <ddavison@gitlab.com>
* | | | | | | | | | 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
|/ / / / / / / / / / / /