summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove ignore_column occurence in CE coderemove-old-ignore-columnDmitriy Zaporozhets2019-09-105-20/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch '13076-add-stage-button' into 'master'Clement Ho2019-09-105-4/+28
|\ | | | | | | | | CE Backport: Customisable Cycle Analytics - Add stage button See merge request gitlab-org/gitlab-ce!31791
| * Async import custom stage form componentsEzekiel Kigbo2019-09-105-4/+28
|/ | | | | | | Imports the files needed for the custom stage form and adds the EE specific css. Added stub addStageMixin
* Merge branch 'danger-fixup' into 'master'Nick Thomas2019-09-101-1/+28
|\ | | | | | | | | Danger: Allow fixup commits if squash enabled or MR is WIP See merge request gitlab-org/gitlab-ce!32210
| * Danger: Allow fixup commits if squash enabled or MR is WIPElan Ruusamäe2019-09-101-1/+28
|/
* Merge branch 'docs-UpdateJaeger-URL' into 'master'Achilleas Pipinellis2019-09-101-1/+1
|\ | | | | | | | | Docs update jaeger url See merge request gitlab-org/gitlab-ce!32640
| * Docs update jaeger urlDov Hershkovitch2019-09-101-1/+1
|/
* Merge branch 'docs/add-proxying-assets-content-from-omnibus' into 'master'Achilleas Pipinellis2019-09-101-16/+56
|\ | | | | | | | | Combine asset proxying content from Omnibus See merge request gitlab-org/gitlab-ce!32807
| * Combine asset proxying content from OmnibusEvan Read2019-09-101-16/+56
|/
* Merge branch 'fj-62807-not-prefill-target-branch' into 'master'Lin Jen-Shin2019-09-104-53/+83
|\ | | | | | | | | | | | | Avoid filling target branch when unknown and source is default branch Closes #62807 See merge request gitlab-org/gitlab-ce!32701
| * Avoid setting merge request target branch when source if default branchfj-62807-not-prefill-target-branchFrancisco Javier López2019-09-104-53/+83
| | | | | | | | | | | | | | In case the source and the target project are the same, the source branch is the default branch, and the target branch is not present, we will avoid prefilling the target branch with the repository default branch. Letting the user decide.
* | Merge branch ↵Jan Provaznik2019-09-102-4/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'reprazent/gitlab-ce-bvl-find-correct-variables-for-testing-translations' into 'master' Build correct variables for testing translations Closes #48110 See merge request gitlab-org/gitlab-ce!32871
| * | Add code review remarksreprazent/gitlab-ce-bvl-find-correct-variables-for-testing-translationsMałgorzata Ksionek2019-09-101-7/+2
| | |
| * | Build correct variables for testing translationsBob Van Landuyt2019-09-102-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure we build the correct variables for testing translations. When translating, we could be specifying the variables in different forms for each id: - In the singular we could be using a `%{hash}` interpolation - In the plural we could be using a `%d` interpolation This changes the tests to accommodate for that: We now use the variables used in the relevant translation id as the source for the variables we mix in in specs.
* | | Merge branch '21859-newline_in_filename' into 'master'Nick Thomas2019-09-102-5/+67
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Start of fix for #21859, allow users to open files with newlines in the filenames. Closes #21859 See merge request gitlab-org/gitlab-ce!32820
| * | | Start of fix for #21859, allow users to open files with newlines in the ↵Jesse Hall2019-09-102-5/+67
|/ / / | | | | | | | | | filenames.
* | | Merge branch 'fix-events-migration' into 'master'Andreas Brandl2019-09-102-3/+13
|\ \ \ | |/ / |/| | | | | | | | Add index on group_id column concurrently See merge request gitlab-org/gitlab-ce!32826
| * | Add index on group_id column concurrentlyJan Provaznik2019-09-102-3/+13
|/ / | | | | | | | | This fixes previously added migration which caused timeouts on big events table.
* | Merge branch 'docs-ee-repository_storage' into 'master'Achilleas Pipinellis2019-09-101-3/+3
|\ \ | | | | | | | | | | | | Add EE label to repository_storage See merge request gitlab-org/gitlab-ce!31933
| * | Add EE label to repository_storageBen Bodenmiller2019-09-101-3/+3
|/ /
* | Merge branch 'docs-dollar-signs' into 'master'remove-router-in-store-ideAchilleas Pipinellis2019-09-1011-45/+42
|\ \ | | | | | | | | | | | | Start linting for unneeded dollar signs See merge request gitlab-org/gitlab-ce!32803
| * | Start linting for unneeded dollar signsMarcel Amirault2019-09-1011-45/+42
|/ / | | | | | | | | Do not use dollar signs in shell codeblocks when no output is shown
* | Merge branch 'event-presenter' into 'master'Rémy Coutable2019-09-1011-15/+83
|\ \ | | | | | | | | | | | | [CE] Add event presenter See merge request gitlab-org/gitlab-ce!32750
| * | Add event presenterJan Provaznik2019-09-1011-15/+83
|/ / | | | | | | | | This presenter will be used in an upcoming MR which adds rendering of epic events on group activity page.
* | Merge branch 'docs/ds-auto-remediation' into 'master'Achilleas Pipinellis2019-09-102-46/+47
|\ \ | | | | | | | | | | | | Refactor the Dependency Scanning docs See merge request gitlab-org/gitlab-ce!32582
| * | Refactor the Dependency Scanning docsAchilleas Pipinellis2019-09-102-46/+47
|/ / | | | | | | | | | | | | | | | | | | | | | | Notably: - Merge the use cases with the opening paragraph of DS - Add link to the auto-remediation section in the main index page - Add auto remediation to the title of solutions for better SEO - Move the JSON reports section below the other more important sections - Remove Container Scanning from the list of supported scanners in solutions - Fix some "introduced in" sentences so that they can be properly parsed
* | Merge branch 'fix-broken-docs-link' into 'master'Evan Read2019-09-101-1/+1
|\ \ | | | | | | | | | | | | Fix broken link to the handbook See merge request gitlab-org/gitlab-ce!32849
| * | Fix broken link to the handbookDavid H. Wilkins2019-09-091-1/+1
| | | | | | | | | | | | - Broken link to "How to work with the distribution team"
* | | Merge branch 'docs-dblessing-codeowners-approvals' into 'master'Evan Read2019-09-101-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Only CODEOWNERS on default branch affect MR approvals See merge request gitlab-org/gitlab-ce!32841
| * | | Only CODEOWNERS on default branch affect MR approvalsdocs-dblessing-codeowners-approvalsDrew Blessing2019-09-091-0/+4
| | | |
* | | | Merge branch 'docs-add-user-creation-blunceford' into 'master'Evan Read2019-09-106-0/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user creation documentation Closes gitlab-com/support/support-team-meta#1681 See merge request gitlab-org/gitlab-ce!32411
| * | | | Add user creation documentationBlair Lunceford2019-09-106-0/+41
|/ / / /
* | | | Merge branch 'remove-unnecessary-freeze-in-lib' into 'master'Lin Jen-Shin2019-09-1018-31/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in lib See merge request gitlab-org/gitlab-ce!32788
| * | | | Avoid calling freeze on already frozen strings in libDinesh Panda2019-09-1018-31/+31
|/ / / /
* | | | Merge branch 'docs-update-jest-with-when-to-use-section' into 'master'Evan Read2019-09-101-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Add when to use Jest section in frontend_testing See merge request gitlab-org/gitlab-ce!32760
| * | | | Docs: Add when to use Jest section in frontend_testingPaul Slaughter2019-09-101-3/+12
|/ / / /
* | | | Merge branch 'list-style-fixes-dev-docs' into 'master'Evan Read2019-09-101-17/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Edits to Lists section of Documentation Style Guide See merge request gitlab-org/gitlab-ce!32782
| * | | | Edits to Lists section of Documentation Style GuideMike Lewis2019-09-101-17/+24
|/ / / /
* | | | Merge branch 'jarv/remove-reference-to-closed-issue' into 'master'Evan Read2019-09-101-4/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | This references an issue that is closed See merge request gitlab-org/gitlab-ce!29274
| * | | | This references an issue that is closedJohn Jarvis2019-09-101-4/+1
|/ / / /
* | | | Merge branch 'ebaque-issue-mr-urls' into 'master'Lin Jen-Shin2019-09-103-1/+85
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Provide urls for Merge Requests and Issue links See merge request gitlab-org/gitlab-ce!32401
| * | | | Provide urls for Merge Requests and Issue linksEtienne Baqué2019-09-103-1/+85
|/ / / /
* | | | Merge branch 'doc-markdown-fix' into 'master'Achilleas Pipinellis2019-09-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cosmetic fix in doc/user/markdown.md where the word 'itself' is repeated. See merge request gitlab-org/gitlab-ce!32818
| * | | | Cosmetic fix in doc/user/markdown.md where the word 'itself' is repeated.Raimund Hook2019-09-091-1/+1
| | | | |
* | | | | Merge branch 'docs/ci-short-token-variable' into 'master'Evan Read2019-09-101-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document CI_RUNNER_SHORT_TOKEN variable See merge request gitlab-org/gitlab-ce!32824
| * | | | | Document CI_RUNNER_SHORT_TOKEN variableTomasz Maczukin2019-09-101-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Variable was added in GitLab Runner with: https://gitlab.com/gitlab-org/gitlab-runner/merge_requests/1571
* | | | | Merge branch 'docs/smime-signing-omnibus-example' into 'master'Achilleas Pipinellis2019-09-101-12/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | docs: add full omnibus example for smime signing See merge request gitlab-org/gitlab-ce!32146
| * | | | | docs: add full omnibus example for smime signingDiego Louzán2019-09-101-12/+39
|/ / / / / | | | | | | | | | | | | | | | | | | | | - minor style corrections - document rsa keys limitation
* | | | | Merge branch 'patch-76' into 'master'Ray Paik2019-09-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update merge_request_approvals.md - typo See merge request gitlab-org/gitlab-ce!32838
| * | | | | Update merge_request_approvals.md - typoNiels Peto2019-09-091-1/+1
| | | | | |
View Lorry Controller Status