summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use stub_rails_env for Rails.env stubbing66966-convert-rails-env-stub-usages-to-use-railshelpers-stub_rails_env-insteadAsh McKenzie2019-09-0515-45/+25
| | | | | RailsHelpers.stub_rails_env takes care of stubbing Rails.env
* Merge branch 'mj/code-review-avoid' into 'master'Ash McKenzie2019-09-051-2/+7
|\ | | | | | | | | What to avoid in code review See merge request gitlab-org/gitlab-ce!32592
| * What to avoid in code reviewmj/code-review-avoidMarin Jankovski2019-09-041-2/+7
| |
* | Merge branch 'fix/regression-remove-installation-pod' into 'master'Mayra Cabrera2019-09-045-4/+25
|\ \ | | | | | | | | | | | | Bring method back that was mistakenly removed See merge request gitlab-org/gitlab-ce!32667
| * | Bring method back that was mistakenly removedJoão Cunha2019-09-045-4/+25
|/ / | | | | | | - We're also improving specs to avoid this could happen again
* | Merge branch '62535-upgrade-graphql-gem-to-latest-version-1-9-6-or-higher' ↵Mayra Cabrera2019-09-0410-23/+37
|\ \ | | | | | | | | | | | | | | | | | | into 'master' Upgrade GraphQL gem to 1.9.11 See merge request gitlab-org/gitlab-ce!31980
| * | Upgrade graphql gem to 1.9.10Brett Walker2019-09-0410-23/+37
|/ / | | | | | | | | | | - `edge_nodes` needs to get called on the object - added `include GlobalID::Identification` in a couple places - renamed `object` to `item` in spec due to conflict
* | Merge branch ↵Paul Slaughter2019-09-046-14/+29
|\ \ | | | | | | | | | | | | | | | | | | '12155-update-pipelines-minutes-expiry-banner-to-an-alert-component-type-ce' into 'master' CE - Update pipelines minutes expiry banner to an alert component type See merge request gitlab-org/gitlab-ce!31654
| * | Update Pipelines Minutes expire banner (CE)Ammar Alakkad2019-09-046-14/+29
|/ / | | | | | | | | | | | | - remove hiding the alert functionality - use `danger` class instead of `warning` https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14786
* | Merge branch ↵Mayra Cabrera2019-09-044-29/+46
|\ \ | | | | | | | | | | | | | | | | | | '64009-show-a-meaningful-error-message-when-due-quick_actions-command-fails-because-the-date-format-is-invalid' into 'master' Resolve "Show a meaningful error message when /due quick_actions command fails because the date format is invalid" See merge request gitlab-org/gitlab-ce!32349
| * | Show meaningful message on /due quick action with invalid date🙈 jacopo beschi 🙉2019-09-044-29/+46
|/ / | | | | | | | | When using /due quick action with an invalid date a meaninful error message is shown.
* | Merge branch 'ab-add-index-for-ci-builds-metrics' into 'master'Mayra Cabrera2019-09-043-0/+25
|\ \ | | | | | | | | | | | | Create partial index for gitlab-monitor CI metrics See merge request gitlab-org/gitlab-ce!32546
| * | Create partial index for gitlab-monitor CI metricsab-add-index-for-ci-builds-metricsAndreas Brandl2019-09-043-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This creates a partial index intended to speed up queries on `ci_builds`. Particularly, `gitlab-monitor` has rather heavy queries. Those have been changed to only look back 7 days and benefit from this index tremendously. Relates to https://gitlab.com/gitlab-org/gitlab-exporter/merge_requests/101.
* | | Merge branch 'an-stricter-prom-checks' into 'master'Mayra Cabrera2019-09-042-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Stricter validation of prometheus label values See merge request gitlab-org/gitlab-ce!32460
| * | | Stricter validation of prometheus label valuesAndrew Newdigate2019-09-042-3/+3
|/ / / | | | | | | | | | See https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/38
* | | Merge branch 'docs/13496-use-security-dashboard-in-pipelines-view' into 'master'Achilleas Pipinellis2019-09-0410-21/+21
|\ \ \ | | | | | | | | | | | | | | | | Update Pipeline Security Dashboard documentation See merge request gitlab-org/gitlab-ce!32396
| * | | Update Pipeline Security Dashboard documentationMark Florian2019-09-0410-21/+21
|/ / / | | | | | | | | | Tracked in https://gitlab.com/gitlab-org/gitlab-ee/issues/13496.
* | | Merge branch 'docs-ssot-api-templates' into 'master'Achilleas Pipinellis2019-09-044-1/+82
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | SSoT for API template docs Closes #64589 See merge request gitlab-org/gitlab-ce!31320
| * | | Added SSoT front and back matterMatt Penna2019-09-044-1/+82
|/ / / | | | | | | | | | | | | | | | These docs are straightforward API reference material and needed only to have document type header and troubleshooting footer added for the SSoT effort.
* | | Merge branch 'remove-unnecessary-freeze-in-app' into 'master'Mayra Cabrera2019-09-044-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Remove unnecessary freeze in app See merge request gitlab-org/gitlab-ce!32636
| * | | Remove unnecessary freeze in appDinesh Panda2019-09-044-5/+5
|/ / /
* | | Merge branch 'docs-storage-counteer' into 'master'Achilleas Pipinellis2019-09-041-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Adds docs for total usage storage quota See merge request gitlab-org/gitlab-ce!32600
| * | | Adds docs for total usage storage quotaFilipa Lacerda2019-09-041-0/+6
|/ / /
* | | Merge branch '62535-upgrade-graphql-gem-to-version-1-8-17' into 'master'Mayra Cabrera2019-09-0428-58/+74
|\ \ \ | | | | | | | | | | | | | | | | Upgrade GraphQL gem to 1.8.17 See merge request gitlab-org/gitlab-ce!32299
| * | | Upgrade GraphQL gem to 1.8.17Brett Walker2019-09-0428-58/+74
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | - Due to https://github.com/exAspArk/batch-loader/pull/32, we changed BatchLoader.for into BatchLoader::GraphQL.for - since our results are wrapped in a BatchLoader::GraphQL, calling `sync` during authorization is required to get real object - `graphql` now has it's own authorization system. Our `authorized?` method conflicted and required renaming
* | | Merge branch 'add-markdownlint-to-dependencies' into 'master'Clement Ho2019-09-042-3/+71
|\ \ \ | | | | | | | | | | | | | | | | Add markdownlint-cli to yarn dependencies See merge request gitlab-org/gitlab-ce!32593
| * | | Add markdownlint-cli to yarn dependenciesAchilleas Pipinellis2019-09-042-3/+71
|/ / / | | | | | | | | | | | | | | | This is the tool that we use to lint the Markdown files. Let's add it to yarn.lock so that we can use it in development. Pinned to 0.18.0.
* | | Merge branch 'update-eslint-utils-to-1.4.2' into 'master'Mike Greiling2019-09-041-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update eslint-utils to 1.4.2 Fixes vulnerability in development environment. See https://nvd.nist.gov/vuln/detail/CVE-2019-15657 See merge request gitlab-org/gitlab-ce!32251
| * | | Update eslint-utils to 1.4.2Takuya Noguchi2019-08-301-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > In eslint-utils before 1.4.1, the getStaticValue function can execute arbitrary code. - https://github.com/mysticatea/eslint-utils/security/advisories/GHSA-3gx7-xhv7-5mx3 - https://nvd.nist.gov/vuln/detail/CVE-2019-15657 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | Merge branch 'remove-unnecessary-freeze-in-app-finders' into 'master'Stan Hu2019-09-042-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in app/finders See merge request gitlab-org/gitlab-ce!32634
| * | | | Avoid calling freeze on already frozen strings in app/findersdineshpanda2019-09-042-4/+4
| | | | |
* | | | | Merge branch 'je-add-group-deployments-page-fe' into 'master'Mike Greiling2019-09-047-30/+127
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add ability to see project deployments at cluster level (FE) See merge request gitlab-org/gitlab-ce!31575
| * | | | | Add ability see deployments using a group clusterJacques Erasmus2019-09-047-30/+127
|/ / / / / | | | | | | | | | | | | | | | Added the ability to see project deployments using a group cluster
* | | | | Merge branch 'issue_54042' into 'master'Michael Kozono2019-09-0414-6/+168
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let project reporters create issue from group boards Closes #54042 See merge request gitlab-org/gitlab-ce!29866
| * | | | | Let project reporters create issue from group boardsFelipe Artur2019-09-0414-6/+168
|/ / / / / | | | | | | | | | | | | | | | | | | | | The current state of group issue boards does not show the "Add issues" button on the UI for users that are reporters of group child projects.
* | | | | Merge branch ↵Michael Kozono2019-09-049-1/+344
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60372-milestone-link-prevent-delete-issue-after-move-it-to-another-project-2' into 'master' Add service to transfer Group Milestones when transferring a Project See merge request gitlab-org/gitlab-ce!31778
| * | | | | Add service to transfer group milestonesEugenia Grieff2019-09-049-1/+344
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new service that transfers milestones from a group to a project - Include new service in Projects transfer service - Include FromUnion module in Milestone model to use in transfer service - Add specs for new milestones service - Add specs for transferring milestones in project transfer service
* | | | | Merge branch 'fix-smime-settings-require' into 'master'Rémy Coutable2019-09-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use spec_helper for S/MIME settings specs See merge request gitlab-org/gitlab-ce!32647
| * | | | | Use spec_helper for S/MIME settings specsfix-smime-settings-requireYorick Peterse2019-09-041-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The constant tested is defined in an initializer, and these are not loaded when using fast_spec_helper. When running just this test file, or when running this test first this can lead to test failures. To fix this we just use spec_helper instead of fast_spec_helper.
* | | | | Merge branch 'docs-sethgitlab-dast' into 'master'Achilleas Pipinellis2019-09-041-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarified website url precedence See merge request gitlab-org/gitlab-ce!32599
| * | | | | Clarified website url precedenceSeth Berger2019-09-041-0/+2
|/ / / / /
* | | | | Merge branch 'docs-fixes-scheduling-on-background-migrations' into 'master'66922Achilleas Pipinellis2019-09-041-6/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cleans up "Scheduling" section on Background Migrations See merge request gitlab-org/gitlab-ce!32557
| * | | | | Removes regular migrations from background onesMayra Cabrera2019-09-041-6/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | Specifies that background migrations should be scheduled as post deployment migrations
* | | | | Merge branch 'docs-sethgitlab-dast-ssot' into 'master'Achilleas Pipinellis2019-09-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removed reference to project for DAST See merge request gitlab-org/gitlab-ce!32601
| * | | | | Removed reference to project for DASTSeth Berger2019-09-041-1/+1
|/ / / / /
* | | | | Merge branch 'osw-record-repo-push-events' into 'master'James Lopez2019-09-043-4/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport EE "Track repository pushes as audit events" See merge request gitlab-org/gitlab-ce!32304
| * | | | | Backport "Track repository pushes as audit events"Oswaldo Ferreira2019-09-043-4/+17
| | | | | |
* | | | | | Merge branch 'remove-unnecessary-freeze-in-app-services' into 'master'Rémy Coutable2019-09-0411-14/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in app/services See merge request gitlab-org/gitlab-ce!32635
| * | | | | | Avoid calling freeze on already frozen strings in app/servicesdineshpanda2019-09-0411-14/+14
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ce-14713-fix-geo-link-pointing-to-online-doc' into 'master'Douglas Barbosa Alexandre2019-09-041-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a link to the 'Repository Storage Types' doc page See merge request gitlab-org/gitlab-ce!32650
View Lorry Controller Status