summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move Identity.uniqueness_scope to a modulerefactor-reference-regexes-and-identity-scopesYorick Peterse2018-11-122-6/+13
| | | | | | Moving this method to a separate module looks a bit odd, but it allows for EE to extend the method without also having to redefine a variety of validation rules.
* Turn reference regex constants into methodsYorick Peterse2018-11-123-11/+17
| | | | | | | | | | | | | | | | | | | | | | `Mentionable::ReferenceRegexes` used to define the following two constants: 1. DEFAULT_PATTERN 2. EXTERNAL_PATTERN These two constants were built using some of the class methods that reside in this same module. In EE we redefine one of these methods by using `prepend` at the start of the `ReferenceRegexes` module. This poses a problem: we can not move the `prepend` to the end of the file, because the constants later on depend on it. To resolve this problem, this commit turns these constants into class methods that memoize their results. This allows EE to redefine the appropriate methods before these two class methods are used, in turn allowing us to move the `prepend` to the end of the file. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8198 for more information.
* Merge branch 'docs/danger-documentation' into 'master'Rémy Coutable2018-11-121-3/+26
|\ | | | | | | | | Dangerbot: mention tech writers based on DevOps stage See merge request gitlab-org/gitlab-ce!22945
| * Proper markdown table in docs DangerfileAchilleas Pipinellis2018-11-121-14/+16
| |
| * Edits to docs Dangerfiledocs/danger-documentationMike Lewis2018-11-091-10/+21
| |
| * Dangerbot: mention tech writers based on DevOps stageAchilleas Pipinellis2018-11-091-3/+13
| |
* | Merge branch 'sh-bump-sidekiq' into 'master'Sean McGivern2018-11-122-5/+5
|\ \ | | | | | | | | | | | | Bump Sidekiq and other related gems See merge request gitlab-org/gitlab-ce!22956
| * | Update gems in Gemfile.rails5.lockJan Provaznik2018-11-121-2/+2
| | |
| * | Bump Sidekiq and other related gemsStan Hu2018-11-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Sidekiq changes: https://github.com/mperham/sidekiq/blob/master/Changes.md * Rack 1.6.1 fixes CVE-2014-9490: https://github.com/rack/rack/blob/master/CHANGELOG.md * rack-protection 2.0.4 only fixes a minor message: https://github.com/sinatra/sinatra/commits/master/rack-protection
* | | Merge branch 'jprovazn-fix-status-spec' into 'master'qa-xss-in-mentions-testRémy Coutable2018-11-121-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix ./spec/features/issues/user_views_issue_spec.rb Closes gitlab-ee#8390 See merge request gitlab-org/gitlab-ce!22976
| * | | Fix transient rspec issueJan Provaznik2018-11-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI randomly fails with: ActiveRecord::RecordNotFound: Couldn't find Project with 'id'=724 This is probably caused by DB cleanup strategy used for :js tests in combination with `set`.
* | | | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-1215-242/+374
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684
| * | | | Fix minor offensesblackst0ne-add-discord-serviceblackst0ne2018-11-102-6/+2
| | | | |
| * | | | Refactor specsblackst0ne2018-11-074-469/+253
| | | | |
| * | | | DRY specs, fix typos in docsblackst0ne2018-11-065-45/+35
| | | | |
| * | | | Update documentation after documentation review.blackst0ne2018-11-051-2/+2
| | | | |
| * | | | Updated docs and removed redundant screenshotblackst0ne2018-11-052-2/+2
| | | | |
| * | | | Update docs after docs reviewblackst0ne2018-11-051-14/+13
| | | | |
| * | | | Update Gemfileblackst0ne2018-11-053-17/+7
| | | | |
| * | | | Fix frozen stringsblackst0ne2018-11-051-0/+2
| | | | |
| * | | | Update documentationblackst0ne2018-11-053-0/+31
| | | | |
| * | | | Add spec for DiscordServiceblackst0ne2018-11-051-0/+242
| | | | |
| * | | | Update discord notification serviceblackst0ne2018-11-051-6/+4
| | | | |
| * | | | Add changelog entryblackst0ne2018-11-051-0/+5
| | | | |
| * | | | Add Discord integrationblackst0ne2018-10-309-0/+95
| | | | |
* | | | | Merge branch 'disable-usage-ping-review-apps' into 'master'Rémy Coutable2018-11-121-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disable usage pings in review apps See merge request gitlab-org/gitlab-ce!22965
| * | | | | Disable usage pings in review appsdisable-usage-ping-review-appsBalasankar "Balu" C2018-11-111-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch ↵Sean McGivern2018-11-123-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup' into 'master' Update gitlab-markup gem to avoid binary name collision Closes #53082 See merge request gitlab-org/gitlab-ce!22960
| * | | | | Update gitlab-markup gem to avoid binary name collision53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markupAlejandro Rodríguez2018-11-113-5/+5
| |/ / / / | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082
* | | | | Merge branch 'docs/more-url-fixes' into 'master'Dmitriy Zaporozhets2018-11-123-27/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fix some links and Markdown See merge request gitlab-org/gitlab-ce!22972
| * | | | Fix some links and Markdowndocs/more-url-fixesEvan Read2018-11-123-27/+23
| | | | |
* | | | | Merge branch 'docs/fix-more-urls' into 'master'Achilleas Pipinellis2018-11-124-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update URLs to better ones See merge request gitlab-org/gitlab-ce!22931
| * | | | | Implement review commentsdocs/fix-more-urlsEvan Read2018-11-122-4/+4
| | | | | |
| * | | | | Update URLs to better onesEvan Read2018-11-094-4/+4
| | | | | |
* | | | | | Merge branch 'docs/fix-helm-chart-issue-link' into 'master'Achilleas Pipinellis2018-11-121-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Fix link for raising helm chart issues See merge request gitlab-org/gitlab-ce!22970
| * | | | | Fix link for raising helm chart issuesdocs/fix-helm-chart-issue-linkEvan Read2018-11-121-2/+2
| | | | | |
* | | | | | Merge branch 'add-rbac-link-in-k8s-docs' into 'master'Evan Read2018-11-121-3/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Add link in K8s integration docs to RBAC roles See merge request gitlab-org/gitlab-ce!22941
| * | | | | Add link in K8s integration docs to RBAC rolesadd-rbac-link-in-k8s-docsDylan Griffith2018-11-091-3/+4
| | | | | |
* | | | | | Merge branch 'docs-update-variable-naming' into 'master'Evan Read2018-11-1111-18/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update Variable naming See merge request gitlab-org/gitlab-ce!22352
| * | | | | | Docs: Update Variable namingMarcel Amirault2018-11-1111-18/+18
|/ / / / / /
* | | | | | Merge branch 'fix-error-handling-bugs-in-kubernetes-integration' into 'master'Dmitriy Zaporozhets2018-11-114-3/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Fix error handling bugs in kubernetes integration See merge request gitlab-org/gitlab-ce!22922
| * | | | | Add changelog for fixing k8s integration error handlingfix-error-handling-bugs-in-kubernetes-integrationThong Kuah2018-11-091-0/+5
| | | | | |
| * | | | | Fix error handling in cluster_platform_configure_workerDylan Griffith2018-11-092-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have also extracted an issue in https://gitlab.com/gitlab-org/gitlab-ce/issues/53738 to surface these errors to users but now I am just fixing the bug where kubernetes_namespace is undefined while handling this error
| * | | | | Remove special handling for 404 response from K8sDylan Griffith2018-11-091-2/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to specially handle 404 here. We only handle 404 specifically if we are fetching something and want to return `nil` if 404. This does not apply here.
* | | | | Merge branch '51259-ci-cd-gitlab-ui-1' into 'master'Clement Ho2018-11-098-68/+96
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-ui in jobs and pipelines See merge request gitlab-org/gitlab-ce!22782
| * | | | | Use gitlab-ui in jobs and pipelinesFilipa Lacerda2018-11-098-68/+96
|/ / / / /
* | | | | Merge branch 'sh-redact-links-remove-circular-dependency-ce' into 'master'Douglas Barbosa Alexandre2018-11-092-17/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove circular dependency on Redactable in migration See merge request gitlab-org/gitlab-ce!22951
| * | | | | Remove circular dependency on Redactable in migrationStan Hu2018-11-092-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::BackgroundMigration::RedactLinks was prepending EE::Gitlab::BackgroundMigration::RedactLinks, while EE::Gitlab::BackgroundMigration::RedactLinks was trying to include Gitlab::BackgroundMigration::RedactLinks::Redactable. Ruby 2.5.3 failed with an uninitialized constant (https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/118388511).
* | | | | | Merge branch '48475-gitlab-pages-settings-regressions' into 'master'Annabel Dunstone Gray2018-11-094-13/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GitLab Pages settings regressions" Closes #48475 See merge request gitlab-org/gitlab-ce!22821
| * | | | | | Resolve "GitLab Pages settings regressions"Scott Hampton2018-11-094-13/+17
|/ / / / / /