summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'drop-default-value-status-deployments' into 'master'Kamil Trzciński2018-11-203-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop default value on status column in deployments table Closes #53702 See merge request gitlab-org/gitlab-ce!22971
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-ce' into drop-default-value-status-deploymentsShinya Maeda2018-11-20129-1227/+1429
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove unnecessary codedrop-default-value-status-deploymentsShinya Maeda2018-11-191-4/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add changelogShinya Maeda2018-11-191-0/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master-ce' into drop-default-value-status-deploymentsShinya Maeda2018-11-19605-3309/+6386
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix nilShinya Maeda2018-11-191-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove unnecessary line in schema.rbShinya Maeda2018-11-131-1/+0
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Drop default value on status column in deployments tableShinya Maeda2018-11-132-2/+21
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'docs/dangerfile' into 'master'Achilleas Pipinellis2018-11-201-18/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the table of tech writers and stages more compact See merge request gitlab-org/gitlab-ce!23153
| * | | | | | | | | | | | | | | | | | Make the table of tech writers and stages more compactdocs/dangerfileAchilleas Pipinellis2018-11-161-18/+9
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSteve Azzopardi2018-11-208-11/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sh-fix-issue-54189' into 'master'Steve Azzopardi2018-11-204-1/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Prevent templated services from being imported See merge request gitlab/gitlabhq!2634
| | * | | | | | | | | | | | | | | | | | Prevent templated services from being importedStan Hu2018-11-194-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Templated services should only be created by admins and does not apply to project import/export. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54189
| * | | | | | | | | | | | | | | | | | | Merge branch 'security-2717-xss-username-autocomplete' into 'master'Steve Azzopardi2018-11-203-10/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2605
| | * | | | | | | | | | | | | | | | | | Add changelog entryKushal Pandya2018-11-121-0/+5
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix user name autocomplete XSS when name contains HTMLKushal Pandya2018-11-122-10/+34
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 11.4.6GitLab Release Tools Bot2018-11-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 11.3.10GitLab Release Tools Bot2018-11-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | | | Merge branch '53290-incorrect-project-list-order-select-default-label' into ↵Grzegorz Bizon2018-11-203-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Incorrect project list order select default label" Closes #53290 See merge request gitlab-org/gitlab-ce!23058
| * | | | | | | | | | | | | | | | | | | | Fix default sorting for subgroups and projects list53290-incorrect-project-list-order-select-default-labelJacopo2018-11-143-1/+13
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '52712-further-ui-improvements-to-profile-overview-tab' into ↵Phil Hughes2018-11-208-106/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Further UI improvements to Profile "Overview" tab" Closes #52712 See merge request gitlab-org/gitlab-ce!22977
| * | | | | | | | | | | | | | | | | | | | Resolve "Further UI improvements to Profile "Overview" tab"Martin Wortschack2018-11-208-106/+98
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-issue-8448-ce' into 'master'Steve Azzopardi2018-11-201-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stub Rails.application.env_config to prevent spec failures Closes gitlab-ee#8488 See merge request gitlab-org/gitlab-ce!23222
| * | | | | | | | | | | | | | | | | | | | Stub Rails.application.env_config to prevent spec failuressh-fix-issue-8448-ceStan Hu2018-11-191-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we modify env_config, that is on the global Rails.application, and we need to stub it and allow it to be modified in-place, without polluting later tests. When we modify env, then the context is a request, or something else that only lives for a single spec. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8488
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/fix-booklist-link' into 'master'Achilleas Pipinellis2018-11-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change link to help broken link checker See merge request gitlab-org/gitlab-ce!23220
| * | | | | | | | | | | | | | | | | | | | | Change link to help broken link checkerdocs/fix-booklist-linkEvan Read2018-11-201-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch '54015-Markdown-Editor-improve-Cursor-placement' into 'master'Kushal Pandya2018-11-203-9/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine cursor positioning in Markdown Editor for wrap tags. Closes #54015 See merge request gitlab-org/gitlab-ce!23085
| * | | | | | | | | | | | | | | | | | | | | Refine cursor positioning in Markdown Editor for wrap tags.Johann Hubert Sonntagbauer2018-11-203-9/+38
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-unused-partial' into 'master'Sean McGivern2018-11-201-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused partial See merge request gitlab-org/gitlab-ce!23180
| * | | | | | | | | | | | | | | | | | | | Remove unused partialHeinrich Lee Yu2018-11-191-5/+0
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'zj-improve-gitaly-pb' into 'master'Sean McGivern2018-11-2018-1275/+756
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show what RPC is called in the performance bar See merge request gitlab-org/gitlab-ce!23140
| * | | | | | | | | | | | | | | | | | | | Remove duplicate tests for GitalyZeger-Jan van de Weg2018-11-1914-1152/+741
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The disabling of Gitaly was basically stubbing `Feature.enabled?` call, which was never triggered.
| * | | | | | | | | | | | | | | | | | | | Show what RPC is called in the performance barZeger-Jan van de Weg2018-11-164-123/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now only the data was shown of the service, which is not valueable at times given some of those expose a lot of RPCs.
* | | | | | | | | | | | | | | | | | | | | Merge branch ↵Evan Read2018-11-201-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53595-allow-requests-to-local-network-requirement-yaml-include-docs' into 'master' Update docs for include to mention 'allow requests to local network' requirement Closes #53595 See merge request gitlab-org/gitlab-ce!23055
| * | | | | | | | | | | | | | | | | | | | | Update docs for include to mention 'allow requests to local network' requirementDaniel Fernau2018-11-201-0/+5
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'frozen-string-lib-gitlab-even-even-more' into 'master'Stan Hu2018-11-20103-3/+213
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable even more frozen string for lib/gitlab See merge request gitlab-org/gitlab-ce!23161
| * | | | | | | | | | | | | | | | | | | | Enable even more frozen string for lib/gitlabgfyoung2018-11-16103-3/+213
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * lib/gitlab/hook_data/**/*.rb * lib/gitlab/i18n/**/*.rb * lib/gitlab/import/**/*.rb * lib/gitlab/import_export/**/*.rb * lib/gitlab/kubernetes/**/*.rb * lib/gitlab/legacy_github_import/**/*.rb * lib/gitlab/manifest_import/**/*.rb * lib/gitlab/metrics/**/*.rb * lib/gitlab/middleware/**/*.rb Partially addresses gitlab-org/gitlab-ce#47424.
* | | | | | | | | | | | | | | | | | | | Merge branch 'sh-bump-gems-security' into 'master'Douglas Barbosa Alexandre2018-11-194-16/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump nokogiri, loofah, and rack gems for security updates See merge request gitlab-org/gitlab-ce!23204
| * | | | | | | | | | | | | | | | | | | | Bump nokogiri, loofah, and rack gems for security updatesStan Hu2018-11-194-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loofah: CVE-2018-16468: https://github.com/flavorjones/loofah/issues/154 nokogiri: CVE-2018-14404 and CVE-2018-14567 https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md rack: CVE-2018-16471 https://github.com/rack/rack/commit/e5d58031b766e49687157b45edab1b8457d972bd i18n: https://github.com/svenfuchs/i18n/releases concurrent-ruby: https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-bump-ruby-parser' into 'master'Douglas Barbosa Alexandre2018-11-192-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibility See merge request gitlab-org/gitlab-ce!23209
| * | | | | | | | | | | | | | | | | | | | | Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibilityStan Hu2018-11-192-6/+6
| |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/seattlerb/ruby_parser/blob/master/History.rdoc
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rails5-active-record-class-value' into 'master'Stan Hu2018-11-198-10/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 deprecation: Passing a class as a value in an Active Record query is deprecated See merge request gitlab-org/gitlab-ce!23164
| * | | | | | | | | | | | | | | | | | | | | Rails5: Passing a class as a value in an Active Record query is deprecatedJasper Maes2018-11-178-10/+15
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'qa-staging-15-use-existing-users-ce' into 'master'Mark Lapierre2018-11-193-1/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of "qa-staging-15-use-existing-users-ee" See merge request gitlab-org/gitlab-ce!22864
| * | | | | | | | | | | | | | | | | | | | | CE port of "qa-staging-15-use-existing-users-ee"Sanad Liaquat2018-11-193-1/+28
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-runbook-guide' into 'master'Mike Lewis2018-11-199-3/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add guide for creating runbook See merge request gitlab-org/gitlab-ce!22885
| * | | | | | | | | | | | | | | | | | | | resize guide imagesdocs-runbook-guidedanielgruesso2018-11-195-0/+0
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Delete jupyter-start.pngDaniel Gruesso2018-11-121-0/+0
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Upload New FileDaniel Gruesso2018-11-121-0/+0
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Remove start server image, clarify instance auth, use fake token.Daniel Gruesso2018-11-122-6/+3
| | | | | | | | | | | | | | | | | | | | |