summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Resolve more discussionMartin Wortschack2019-08-092-5/+5
| | | | | - Add placeholder for tags in translation - Update PO file
* Apply suggestion to app/views/groups/group_members/index.html.hamlMartin Wortschack2019-08-091-1/+1
|
* Rename search_invited to search_invite_emailStan Hu2019-08-093-4/+6
|
* Resolve first round of discussionsMartin Wortschack2019-08-083-14/+11
| | | | | | - Avoid splitting sentences - Update PO file - Utilize $input-height - Replace pr- with mr-
* Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-07307-1608/+4305
|\
| * Merge branch 'docs-fix-assorted-links' into 'master'Evan Read2019-08-0712-18/+15
| |\ | | | | | | | | | | | | Fix assorted links in the docs See merge request gitlab-org/gitlab-ce!31559
| | * Fix assorted linksMarcel Amirault2019-08-0712-18/+15
| |/ | | | | | | Fix links as discovered by the lint in the docs project
| * Merge branch 'sh-support-csp-nonce' into 'master'Ash McKenzie2019-08-0717-58/+210
| |\ | | | | | | | | | | | | | | | | | | Add support for Content-Security-Policy Closes #65330 See merge request gitlab-org/gitlab-ce!31402
| | * Add support for Content-Security-PolicyStan Hu2019-08-0717-58/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A nonce-based Content-Security-Policy thwarts XSS attacks by allowing inline JavaScript to execute if the script nonce matches the header value. Rails 5.2 supports nonce-based Content-Security-Policy headers, so provide configuration to enable this and make it work. To support this, we need to change all `:javascript` HAML filters to the following form: ``` = javascript_tag nonce: true do :plain ... ``` We use `%script` throughout our HAML to store JSON and other text, but since this doesn't execute, browsers don't appear to block this content from being used and require the nonce value to be present.
| * | Merge branch '52494-separate-namespace-per-project-environment-slug' into ↵Thong Kuah2019-08-0742-542/+968
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Provide separate namespaces for each project environment See merge request gitlab-org/gitlab-ce!30711
| | * | Use separate Kubernetes namespaces per environmentTiger Watson2019-08-0742-542/+968
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kubernetes deployments on new clusters will now have a separate namespace per project environment, instead of sharing a single namespace for the project. Behaviour of existing clusters is unchanged. All new functionality is controlled by the :kubernetes_namespace_per_environment feature flag, which is safe to enable/disable at any time.
| * | Merge branch 'docs-labels-follow-up' into 'master'Evan Read2019-08-071-2/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Follow-up: Tweak line to improve badge placement Closes #65417 See merge request gitlab-org/gitlab-ce!31528
| | * | Follow-up: Tweak line to improve badge placementMarcel Amirault2019-08-071-2/+4
| |/ /
| * | Merge branch 'docs-followup-git-tricks' into 'master'Evan Read2019-08-071-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Follow-Up: Change code blocks to shell type Closes #65605 See merge request gitlab-org/gitlab-ce!31526
| | * | Follow-Up: Change code blocks to shell typeMarcel Amirault2019-08-071-3/+3
| |/ /
| * | Merge branch '60024-remove-restclient-from-prom-client' into 'master'Ash McKenzie2019-08-0717-79/+112
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use Gitlab::HTTP in PrometheusClient instead of RestClient" Closes #60024 See merge request gitlab-org/gitlab-ce!31053
| | * | Convert RestClient to Gitlab::HTTP for Prometheus MonitorDavid Wilkins2019-08-0717-79/+112
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Closes #60024 - Change PrometheusClient.new to accept a base url instead of an already created RestClient - Use Gitlab::HTTP in PrometheusClient instead of creating RestClient in PrometheusService - Move http_options from PrometheusService to PrometheusClient (follow_redirects: false) - ensure that base urls don't have the trailing slash - Created a `PrometheusClient#url` method that might not be strictly required - Change rescued exceptions from RestClient::* to HTTParty::ResponseError where possible and StandardError for the rest
| * | Merge branch 'docs-update-LE-url' into 'master'Evan Read2019-08-071-1/+1
| |\ \ | | | | | | | | | | | | | | | | Docs - Update link in SSL_TLS Certificates Page to Let's Encrypt Intergration See merge request gitlab-org/gitlab-ce!30984
| | * | Docs - Update link in SSL_TLS Certificates Page to Let's Encrypt IntergrationDean Leggo2019-08-071-1/+1
| |/ /
| * | Merge branch 'mc/bug/nil-take' into 'master'remove-duplicate-issue-boards-from-project-export-page-ceStan Hu2019-08-062-19/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix nil take regression Closes #65725 See merge request gitlab-org/gitlab-ce!31554
| | * | Fix nil take regressionmc/bug/nil-takeMatija Čupić2019-08-072-19/+25
| |/ /
| * | Merge branch 'qa-lower-default-cluster-size' into 'master'Dan Davison2019-08-061-1/+1
| |\ \ | | | | | | | | | | | | | | | | Default number of GCP nodes to 1 See merge request gitlab-org/gitlab-ce!31497
| | * | Default number of GCP nodes to 1Dan Davison2019-08-061-1/+1
| |/ / | | | | | | | | | | | | By defaulting to 3, there is unnecessary cost involved
| * | Merge branch 'remove-peek-gc' into 'master'Stan Hu2019-08-066-16/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove GC metrics from performance bar Closes gitlab-org/quality/nightly#122 See merge request gitlab-org/gitlab-ce!31550
| | * | Remove GC metrics from performance barSean McGivern2019-08-066-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | These were disabled in production mode, but that also broke the rest of the performance bar. As they were only enabled in development mode, we can just remove them for now.
| * | | Merge branch 'jramsay/committer-approval-api' into 'master'Douwe Maan2019-08-061-8/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add committer approval API attribute docs Closes #61796 See merge request gitlab-org/gitlab-ce!31538
| | * | | Add committer approval API attributejramsay/committer-approval-apiJames Ramsay2019-08-061-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Requests Approvals can be restricted to prevent the merge request author or merge request committers from self approving. The author restriction is already available in the API, but the committer restriction was not.
| * | | | Merge branch 'update-packer-ci-template' into 'master'Douglas Barbosa Alexandre2019-08-062-1/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Packer.gitlab-ci.yml to use latest image See merge request gitlab-org/gitlab-ce!31548
| | * | | | Update Packer.gitlab-ci.yml to use latest imageKelly Hair2019-08-062-1/+6
| | | | | |
| * | | | | Merge branch '64608-double-tooltips' into 'master'Annabel Dunstone Gray2019-08-063-13/+16
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents showing 2 tooltips in pipelines Closes #64608 See merge request gitlab-org/gitlab-ce!31521
| | * | | | Prevents showing 2 tooltips in pipelines64608-double-tooltipsFilipa Lacerda2019-08-063-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In pipeline's table two tooltips were being rendered With this change only one tooltip is trigerred on hover
| * | | | | Merge branch '65671-update-mini_magick-to-4.9.5' into 'master'Douwe Maan2019-08-062-1/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mini_magick to 4.9.5 Closes #65671 See merge request gitlab-org/gitlab-ce!31505
| | * | | | | Update mini_magick to 4.9.5Takuya Noguchi2019-08-062-1/+6
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | to address CVE-2019-13574 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | Merge branch 'sh-update-nfs-delegation-docs' into 'master'Drew Blessing2019-08-061-0/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Suggest disabling of NFS delegation not needed for RHEL7 update See merge request gitlab-org/gitlab-ce!31546
| | * | | | Suggest disabling of NFS delegation not needed for RHEL7 updateStan Hu2019-08-061-0/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Red Hat finally fixed the NFS server delegation problem that caused the TEST_STATEID flood. Mention the docs that disabling delegation may no longer be needed.
| * | | | Merge branch 'analytics-top-nav' into 'master'Clement Ho2019-08-062-1/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add top navigation analytics link See merge request gitlab-org/gitlab-ce!30324
| | * | | | Add top navigation analytics linkanalytics-top-navLuke Bennett2019-08-062-1/+6
| | |/ / /
| * | | | Merge branch '65152-selective-highlight' into 'master'Bob Van Landuyt2019-08-067-29/+93
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support selective highlighting of lines See merge request gitlab-org/gitlab-ce!31361
| | * | | | Support selective highlighting of lines65152-selective-highlightPatrick Bajao2019-08-067-29/+93
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of highlighting all lines when not all of them are needed, only highlight specific lines. The `BlobPresenter#highlight` method has been updated to support `since` and `to` params. These params will be used to limit the content to be highlighted. Modify `Gitlab::Highlight` to support `since` param which will then be used to determine the starting line number.
| * | | | Merge branch 'rs-no-review-for-auto-deploy' into 'master'Rémy Coutable2019-08-061-0/+2
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Disable review apps for auto-deploy branches See merge request gitlab-org/gitlab-ce!31494
| | * | | Disable Danger review for auto-deploy branchesrs-no-review-for-auto-deployRobert Speicher2019-08-051-0/+1
| | | | |
| | * | | Disable review apps for auto-deploy branchesRobert Speicher2019-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These branches are frequently updated and automatically deployed to real environments, there's not really a benefit to building review apps for them that never get used.
| * | | | Merge branch '65660-update-karma-to-4.2.0' into 'master'65701-docs-feedback-add-a-link-to-a-gitmessage-template-that-can-be-used-for-commitsMike Greiling2019-08-063-189/+228
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update karma to 4.2.0 Closes #65660 See merge request gitlab-org/gitlab-ce!31495
| | * | | | Update karma to 4.2.0Takuya Noguchi2019-08-063-189/+228
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update karma-chrome-launcher, karma-coverage-istanbul-reporter, and karma-webpack. Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Merge branch '43080-speed-up-deploy-keys' into 'master'Thong Kuah2019-08-0611-48/+78
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the performance of viewing deploy keys Closes #43080 See merge request gitlab-org/gitlab-ce!31384
| | * | | | Move migration from migrate to post_migrate43080-speed-up-deploy-keysStan Hu2019-08-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just in case the creation of this index takes a while to create.
| | * | | | Add partial index for deploy keysStan Hu2019-08-052-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31384, this appears to drop the runtime of the query from 1.2 ms (cold), 500ms (warm cache) to < 20 ms.
| | * | | | Add spec for User#accessible_deploy_keysStan Hu2019-08-051-0/+18
| | | | | |
| | * | | | Speed up loading and filtering deploy keys and their projectsNick Thomas2019-08-057-41/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes how we eager-load projects, routes, and namespaces required by the deploy keys endpoint, getting a 10x improvement in my local testing. The endpoint still doesn't scale in-general, but going from ~13 seconds to dump a 63K result to generating the same thing in ~1.6 seconds seems like a good improvement to me.
| | * | | | Stop using pluck to get deploy keys for a userNick Thomas2019-08-052-6/+6
| | | | | |
View Lorry Controller Status