summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix icon colors of related MRs widget60249Fatih Acet2019-04-091-0/+12
|
* Merge branch 'mk/follow-up-fix-default-project-creation-migration' into 'master'Kamil Trzciński2019-04-081-2/+6
|\ | | | | | | | | Fix default_project_creation already exists See merge request gitlab-org/gitlab-ce!27144
| * Fix the backported migrationMichael Kozono2019-04-081-2/+6
|/ | | | | For those who upgraded to a version that included the previous backport implementation with migration 20190311132500.
* Merge branch 'backport-add-default-project-creation-setting' into 'master'Michael Kozono2019-04-082-22/+15
|\ | | | | | | | | Backport `add_default_project_creation_setting` to CE See merge request gitlab-org/gitlab-ce!27141
| * Backport `add_default_project_creation_setting` to CEbackport-add-default-project-creation-settingKamil Trzciński2019-04-082-22/+15
| |
* | Merge branch 'sh-fix-issue-59985' into 'master'Michael Kozono2019-04-082-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Fix stage index migration failing in PostgreSQL 10 Closes #59985 See merge request gitlab-org/gitlab-ce!26972
| * | Fix stage index migration failing in PostgreSQL 10sh-fix-issue-59985Stan Hu2019-04-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in https://www.postgresql.org/message-id/9922.1353433645%40sss.pgh.pa.us, the PostgreSQL window function last_value may not consider the right rows: Note that first_value, last_value, and nth_value consider only the rows within the "window frame", which by default contains the rows from the start of the partition through the last peer of the current row. This is likely to give unhelpful results for last_value and sometimes also nth_value. You can redefine the frame by adding a suitable frame specification (RANGE or ROWS) to the OVER clause. See Section 4.2.8 for more information about frame specifications. This query could be fixed by adding `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING`, but that's quite verbose. It's simpler just to use the first_value function. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59985
* | | Merge branch 'review-revamp-issues-docs' into 'master'Mike Lewis2019-04-082-133/+98
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor Issues doc Closes #56877 See merge request gitlab-org/gitlab-ce!24695
| * | | Refactor Issues docMike Lewis2019-04-082-133/+98
|/ / /
* | | Merge branch 'winh-IS_GITLAB_EE-docs' into 'master'Mike Greiling2019-04-081-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document IS_GITLAB_EE environment variable Closes #60131 See merge request gitlab-org/gitlab-ce!27120
| * | | Document IS_GITLAB_EE environment variablewinh-IS_GITLAB_EE-docsWinnie Hellmann2019-04-081-0/+5
| | |/ | |/|
* | | Merge branch 'winh-jest-no-focused-tests' into 'master'Mike Greiling2019-04-082-5/+11
|\ \ \ | | | | | | | | | | | | | | | | Enable ESLint rule jest/no-focused-tests See merge request gitlab-org/gitlab-ce!27132
| * | | Enable ESLint rule jest/no-focused-testsWinnie Hellmann2019-04-082-5/+11
|/ / /
* | | Merge branch '60231-pipeline-regression-fix' into 'master'Mike Greiling2019-04-081-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Override problematic display with utility class Closes #60231 See merge request gitlab-org/gitlab-ce!27138
| * | | Override problematic display with utility class60231-pipeline-regression-fixsarahghp2019-04-081-2/+2
| | | |
* | | | Merge branch '60123-graphql-complexity-limit-too-low-for-schema-load' into ↵Douglas Barbosa Alexandre2019-04-083-8/+109
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' GraphQL complexity limit too low for Schema load / IntrospectionQuery Closes #60123 See merge request gitlab-org/gitlab-ce!27063
| * | | | Increase GraphQL complexityBrett Walker2019-04-083-8/+109
| | | | | | | | | | | | | | | | | | | | | | | | | An IntrospectionQuery required more complexity points.
* | | | | Merge branch 'ce-issue_6628' into 'master'Lin Jen-Shin2019-04-081-23/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE: Extract EE specific files/lines for Discussion spec/services See merge request gitlab-org/gitlab-ce!26950
| * | | | | Extract EE specific files/lines for Discussion spec/servicesce-issue_6628Felipe Artur2019-04-031-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | This is part of moving GitLab to single codebase
* | | | | | Merge branch 'edits-to-index-of-development-docs' into 'master'Achilleas Pipinellis2019-04-082-32/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edits to documentation dev doc index See merge request gitlab-org/gitlab-ce!27135
| * | | | | | Edits to documentation dev doc indexMike Lewis2019-04-082-32/+23
|/ / / / / /
* | | | | | Merge branch 'patch-2' into 'master'Marcia Ramos2019-04-081-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Fix typo “settings” in Merge requests docs See merge request gitlab-org/gitlab-ce!27020
| * | | | | Fix typo “settings” in Merge requests docsRory O’Kane2019-04-041-1/+1
| | | | | |
* | | | | | Merge branch 'docs-style-and-structure-improvement' into 'master'Achilleas Pipinellis2019-04-081-24/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to Documentation style and structure information See merge request gitlab-org/gitlab-ce!27098
| * | | | | | Improvements to Documentation style and structure informationMike Lewis2019-04-081-24/+26
|/ / / / / /
* | | | | | Merge branch 'pg-10-specs' into 'master'Rémy Coutable2019-04-081-0/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test suite with PostgreSQL 10 to be run on a schedule. Also, move MySQL tests to run only on master branch, and on schedules. See merge request gitlab-org/gitlab-ce!26920
| * | | | | | Add test suite with PostgreSQL 10 to be run on a scheduleBalasankar "Balu" C2019-04-081-0/+27
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, move MySQL tests to run only on master branch, and on schedules. Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | Merge branch 'fix-pull-request-importer' into 'master'Kamil Trzciński2019-04-083-1/+79
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of PR import See merge request gitlab-org/gitlab-ce!27121
| * | | | | | Improve performance of PR importfix-pull-request-importerKamil Trzciński2019-04-083-1/+79
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes unneeded `.reload` call which makes AR to load ALL objects, and create its in-memory representation.
* | | | | | Merge branch '15463-extract-hooks-service' into 'master'Robert Speicher2019-04-0814-659/+879
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract a Git::HooksService Closes #15463 See merge request gitlab-org/gitlab-ce!26726
| * | | | | | Extract a Git::{Base,Tag,Branch}HooksServiceNick Thomas2019-04-0514-659/+879
| | | | | | |
* | | | | | | Merge branch 'bgamari/gitlab-ce-T53279b' into 'master'Rémy Coutable2019-04-089-10/+67
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `updated_at` doesn't apply to `state_event` updates of issues via API. Closes #51279 and #46980 See merge request gitlab-org/gitlab-ce!27124
| * | | | | | Fix `updated_at` doesn't apply to `state_event` updates of issues via APISean McGivern2019-04-089-10/+67
|/ / / / / /
* | | | | | Merge branch 'mw-i18n-flashes' into 'master'Sean McGivern2019-04-0814-34/+133
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings in flash messages See merge request gitlab-org/gitlab-ce!27106
| * | | | | | Externalize strings in flash messagesMartin Wortschack2019-04-0814-34/+133
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Externalize strings in controllers - Update PO file
* | | | | | Merge branch 'document-approach-for-handling-big-repositories' into 'master'Achilleas Pipinellis2019-04-082-0/+236
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add useful tips about big repositories See merge request gitlab-org/gitlab-ce!27005
| * | | | | | Add usefull tips about big repositoriesdocument-approach-for-handling-big-repositoriesKamil Trzciński2019-04-082-0/+236
| | | | | | |
* | | | | | | Merge branch '10938-fix-styleline' into 'master'Phil Hughes2019-04-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds EE folder in the stylelint command See merge request gitlab-org/gitlab-ce!27058
| * | | | | | | Adds EE folder in the stylelint command10938-fix-stylelineFilipa Lacerda2019-04-051-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'instance-configuration-artifact-size' into 'master'Rémy Coutable2019-04-083-1/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display maximum artifact size from runtime config See merge request gitlab-org/gitlab-ce!26784
| * | | | | | | | Display maximum artifact size from runtime configBastian Blank2019-04-033-1/+13
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maximum artifact size was moved into runtime config some time ago. Update the instance configuration code to read this value.
* | | | | | | | Merge branch 'docs-anchors-18' into 'master'Achilleas Pipinellis2019-04-0817-34/+26
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Docs: Fix anchors related to variables doc See merge request gitlab-org/gitlab-ce!27081
| * | | | | | | Docs: Fix anchors related to variables docMarcel Amirault2019-04-0817-34/+26
|/ / / / / / /
* | | | | | | Merge branch 'docs-update-rspec-set-usage' into 'master'Rémy Coutable2019-04-081-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add doc when rspec-set won't work See merge request gitlab-org/gitlab-ce!27050
| * | | | | | | Add doc when rspec-set won't workdocs-update-rspec-set-usageHeinrich Lee Yu2019-04-051-2/+4
| | | | | | | |
* | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Fatih Acet2019-04-082-5/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.59.0 See merge request gitlab-org/gitlab-ce!27104
| * | | | | | | Update dependency @gitlab/svgs to ^1.59.0Lukas 'Eipi' Eipert2019-04-082-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'docs/ci-regexp-syntax' into 'master'Kamil Trzciński2019-04-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update RegExp syntax link to RE2 See merge request gitlab-org/gitlab-ce!27090
| * | | | | | | | Update RegExp syntax link to RE2Cody Mize2019-04-081-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI ref pattern matching now uses RE2 instead of Ruby. See https://about.gitlab.com/2019/04/01/security-release-gitlab-11-dot-9-dot-4-released/ for more information.
* | | | | | | | Merge branch '60035-weight-trainee-maintainers-higher-in-reviewer-roulette' ↵Rémy Coutable2019-04-081-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Weight trainee maintainers higher in reviewer roulette" Closes #60035 See merge request gitlab-org/gitlab-ce!27043