summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Inline except-docs-and-master in gitlab:ui:visual jobwinh-catch-docs-and-master-test-docsWinnie Hellmann2019-03-081-6/+3
|
* Skip gitlab:ui:visual job for docs and masterWinnie Hellmann2019-03-081-3/+6
|
* Merge branch 'deploy-keys-ext' into 'master'Filipa Lacerda2019-03-085-19/+58
|\ | | | | | | | | Externalize admin deploy keys strings See merge request gitlab-org/gitlab-ce!24712
| * Externalize admin deploy keys stringsLuke Bennett2019-03-085-19/+58
| | | | | | | | | | | | Externalizes most strings in the deploy key settings of the admin area.
* | Merge branch 'ce-billings-gold-trial-callout-fe-dashboard' into 'master'Sean McGivern2019-03-0811-11/+11
|\ \ | | | | | | | | | | | | CE FE Refactor dashboard gold trial callouts See merge request gitlab-org/gitlab-ce!25483
| * | Refactor dashboard gold trial calloutsLuke Bennett2019-03-0611-11/+11
| | | | | | | | | | | | | | | Uses new gold trial helper method to render a gold trial callout on user dashboards.
* | | Merge branch '56864-reopen-locked-mr' into 'master'Sean McGivern2019-03-089-6/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disallow reopening of locked merge request Closes #56864 See merge request gitlab-org/gitlab-ce!24882
| * | | Disallow reopening of locked merge requestsJan Beckmann2019-03-089-6/+68
|/ / / | | | | | | | | | Fixes #56864
* | | Merge branch '4925-open-issues-based-on-prometheus-alerts-controller-ce' ↵Kamil Trzciński2019-03-081-5/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove unnecessary license check in operations controller See merge request gitlab-org/gitlab-ce!25728
| * | | Remove unnecessary license check in operations controllerReuben Pereira2019-03-081-5/+0
|/ / /
* | | Merge branch '58649-project-template-for-android' into 'master'Sean McGivern2019-03-086-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project template for Android" Closes #58649 See merge request gitlab-org/gitlab-ce!25870
| * | | Reorder localized stringsJason Lenny2019-03-071-2/+2
| | | |
| * | | Merge branch '58649-project-template-for-android' of ↵Jason Lenny2019-03-070-0/+0
| |\ \ \ | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 58649-project-template-for-android
| | * \ \ Merge branch '58649-project-template-for-android' of ↵Jason Lenny2019-03-070-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 58649-project-template-for-android
| | | * | | Add Android templateJason Lenny2019-03-076-0/+14
| | | | | |
| | * | | | Add Android templateJason Lenny2019-03-076-0/+14
| | | | | |
| * | | | | Add Android templateJason Lenny2019-03-076-0/+14
| | |_|_|/ | |/| | |
* | | | | Merge branch 'skip-visual-master' into 'master'Kushal Pandya2019-03-081-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Skip visual test in master branch See merge request gitlab-org/gitlab-ce!25907
| * | | | | Skip visual test in master branchClement Ho2019-03-081-0/+2
|/ / / / /
* | | | | Merge branch 'remove-select2-rails' into 'master'Mike Greiling2019-03-083-4/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove select2-rails (select2 is now installed via yarn) Closes #36711 See merge request gitlab-org/gitlab-ce!17871
| * | | | | remove select2-rails (select2 is now installed via yarn)Praveen Arimbrathodiyil2019-03-083-4/+1
|/ / / / /
* | | | | Merge branch 'ingress-hostnames' into 'master'Mike Greiling2019-03-0830-154/+234
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for ingress hostnames Closes #58244, #56158, and #46691 See merge request gitlab-org/gitlab-ce!25181
| * | | | | Add support for ingress hostnamesingress-hostnameswalkafwalka2019-03-0730-154/+234
| | | | | |
* | | | | | Merge branch 'docs/minor-ci-landing-restructure' into 'master'Mike Lewis2019-03-081-59/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor CI/CD landing page from feedback See merge request gitlab-org/gitlab-ce!25905
| * | | | | | Refactor CI/CD landing page from feedbackEvan Read2019-03-081-59/+45
|/ / / / / /
* | | | | | Merge branch 'vzagorodny-follow-up-sec-products-vendored-templates-ce' into ↵Stan Hu2019-03-085-3/+178
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Vendored templates for security products EE (follow-up after Dependency Scanning template) See merge request gitlab-org/gitlab-ce!25888
| * | | | | | Use vendored templates for Sec ProductsVictor Zagorodny2019-03-085-3/+178
|/ / / / / / | | | | | | | | | | | | | | | | | | Update Dependency Scanning and add other templates
* | | | | | Merge branch 'docs/add-new-ci-resources' into 'master'Mike Lewis2019-03-089-128/+113
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add and restructure external resources and examples Closes #58041 See merge request gitlab-org/gitlab-ce!25588
| * | | | | | Adds new resources for CI to the documentation suiteEvan Read2019-03-089-128/+113
|/ / / / / / | | | | | | | | | | | | | | | | | | Also refactors and combines resources and examples.
* | | | | | Merge branch 'sh-clarify-rugged-feature-flag-docs' into 'master'Evan Read2019-03-081-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify Rugged direct access only available in GitLab 11.9 See merge request gitlab-org/gitlab-ce!25887
| * | | | | | Clarify Rugged direct access only available in GitLab 11.9Stan Hu2019-03-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until we solve https://gitlab.com/gitlab-com/gitlab-docs/issues/347, let's just be explicit to avoid confusion.
* | | | | | | Merge branch '9224-create-mr-from-vulnerabilty-feedback-fe' into 'master'Luke Bennett2019-03-081-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes split button styling in modal footers (CE port) See merge request gitlab-org/gitlab-ce!25869
| * | | | | | | Fixes split button styling in modal footerssamdbeckham2019-03-071-2/+4
| | | | | | | |
* | | | | | | | Merge branch 'adriel-add-ci-visual-skip-trigger' into 'master'Clement Ho2019-03-081-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow skip trigger for gitlab:ui:visual Closes gitlab-ui#198 See merge request gitlab-org/gitlab-ce!25894
| * | | | | | | | Allow skip trigger for gitlab:ui:visualAdriel Santiago2019-03-081-0/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding [skip visual] to the commit message the gitlab:ui:visual test can be skipped. This is needed to avoid deadlock situations as exhibited in https://gitlab.com/gitlab-org/gitlab-ui/issues/198
* | | | | | | | Merge branch 'docs/add-missing-keywords' into 'master'Mike Lewis2019-03-082-196/+309
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing keywords Closes #51675 See merge request gitlab-org/gitlab-ce!25444
| * | | | | | | | Add missing keywordsEvan Read2019-03-082-196/+309
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also refactors structure of the page to make the first section more useful.
* | | | | | | | Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'Mike Greiling2019-03-0716-600/+713
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide ee backports related to approver filtering See merge request gitlab-org/gitlab-ce!25876
| * | | | | | | | Provide EE backports for filtering by approver featureIgor2019-03-0716-600/+713
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
* | | | | | | | Merge branch 'docs-ci-getting-started' into 'master'Mike Lewis2019-03-077-31/+216
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Introduction to continuous methods and GitLab CI/CD Closes #58394 See merge request gitlab-org/gitlab-ce!25611
| * | | | | | | | Add up-to-date illustationsMarcia Ramos2019-03-077-31/+216
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pipeline status - Job running - Rollback button
* | | | | | | | Merge branch 'revert-1c706c68' into 'master'Stan Hu2019-03-073-7/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'" See merge request gitlab-org/gitlab-ce!25895
| * | | | | | | | Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"Luke Duncalfe2019-03-083-7/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | This reverts merge request !25708
* | | | | | | | Merge branch 'gitaly-version-v1.26.0' into 'master'Stan Hu2019-03-072-1/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.26.0 See merge request gitlab-org/gitlab-ce!25890
| * | | | | | | Upgrade Gitaly to v1.26.0GitalyBot2019-03-072-1/+6
|/ / / / / / /
* | | | | | | Merge branch ↵Fatih Acet2019-03-071-1/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58304-extend-the-snowplow-event-tracking-documentation-with-a-testing-section' into 'master' Resolve "Extend the "Snowplow event tracking" documentation with a "testing" section" See merge request gitlab-org/gitlab-ce!25612
| * | | | | | | Resolve "Extend the "Snowplow event tracking" documentation with a "testing" ↵Martin Wortschack2019-03-071-1/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | section"
* | | | | | | Merge branch 'reply-to-comment-documentation' into 'master'Mike Lewis2019-03-071-18/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created documentation for replying to comments See merge request gitlab-org/gitlab-ce!25633
| * \ \ \ \ \ \ Merge branch 'master' into 'reply-to-comment-documentation'reply-to-comment-documentationMike Lewis2019-03-072922-11938/+55015
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | # Conflicts: # doc/user/discussions/index.md
| * | | | | | | Clarifications to email section in introMike Lewis2019-03-071-4/+4
| | | | | | | |
View Lorry Controller Status