diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index cd95105a893..b7b535e70df 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -13,6 +13,7 @@ class Admin::DashboardController < Admin::ApplicationController
@users = User.order_id_desc.limit(10)
@groups = Group.order_id_desc.with_route.limit(10)
@notices = Gitlab::ConfigChecker::PumaRuggedChecker.check
+ @notices += Gitlab::ConfigChecker::ExternalDatabaseChecker.check
end
# rubocop: enable CodeReuse/ActiveRecord
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb
index 522d171b5bf..dc75d37fb01 100644
--- a/app/controllers/graphql_controller.rb
+++ b/app/controllers/graphql_controller.rb
@@ -3,7 +3,12 @@
class GraphqlController < ApplicationController
# Unauthenticated users have access to the API for public data
skip_before_action :authenticate_user!
- skip_around_action :set_session_storage
+
+ # If a user is using their session to access GraphQL, we need to have session
+ # storage, since the admin-mode check is session wide.
+ # We can't enable this for anonymous users because that would cause users using
+ # enforced SSO from using an auth token to access the API.
+ skip_around_action :set_session_storage, unless: :current_user
# Allow missing CSRF tokens, this would mean that if a CSRF is invalid or missing,
# the user won't be authenticated but can proceed as an anonymous user.
diff --git a/changelogs/unreleased/display-db-deprecation-notice.yml b/changelogs/unreleased/display-db-deprecation-notice.yml
new file mode 100644
index 00000000000..b402beba0d2
--- /dev/null
+++ b/changelogs/unreleased/display-db-deprecation-notice.yml
@@ -0,0 +1,5 @@
+---
+title: Implement external database checker in dashboard controller
+merge_request: 30389
+author:
+type: deprecated
diff --git a/changelogs/unreleased/e2300-cs-template.yml b/changelogs/unreleased/e2300-cs-template.yml
new file mode 100644
index 00000000000..39f792370d6
--- /dev/null
+++ b/changelogs/unreleased/e2300-cs-template.yml
@@ -0,0 +1,5 @@
+---
+title: Migrate Container-Scanning template to rules syntax
+merge_request: 30775
+author:
+type: changed
diff --git a/changelogs/unreleased/e2300-dast-template.yml b/changelogs/unreleased/e2300-dast-template.yml
new file mode 100644
index 00000000000..2d06deed7bd
--- /dev/null
+++ b/changelogs/unreleased/e2300-dast-template.yml
@@ -0,0 +1,5 @@
+---
+title: Migrate DAST CI template to rules syntax
+merge_request: 30776
+author:
+type: changed
diff --git a/changelogs/unreleased/e2300-ds-template.yml b/changelogs/unreleased/e2300-ds-template.yml
new file mode 100644
index 00000000000..cfa6a3cbb7c
--- /dev/null
+++ b/changelogs/unreleased/e2300-ds-template.yml
@@ -0,0 +1,5 @@
+---
+title: Migrate Dependency-Scanning CI template to rules syntax
+merge_request: 30907
+author:
+type: changed
diff --git a/changelogs/unreleased/e2300-lm-template.yml b/changelogs/unreleased/e2300-lm-template.yml
new file mode 100644
index 00000000000..26f133f24f4
--- /dev/null
+++ b/changelogs/unreleased/e2300-lm-template.yml
@@ -0,0 +1,5 @@
+---
+title: Migrate License-Scanning CI template to rules syntax
+merge_request: 30784
+author:
+type: changed
diff --git a/changelogs/unreleased/e2300-sast-template.yml b/changelogs/unreleased/e2300-sast-template.yml
new file mode 100644
index 00000000000..fe8ed585d4c
--- /dev/null
+++ b/changelogs/unreleased/e2300-sast-template.yml
@@ -0,0 +1,5 @@
+---
+title: Migrate SAST CI template to rules syntax
+merge_request: 31127
+author:
+type: changed
diff --git a/changelogs/unreleased/fix-admin-mode-graphiql-explorer.yml b/changelogs/unreleased/fix-admin-mode-graphiql-explorer.yml
new file mode 100644
index 00000000000..e4c5091b59d
--- /dev/null
+++ b/changelogs/unreleased/fix-admin-mode-graphiql-explorer.yml
@@ -0,0 +1,5 @@
+---
+title: Fix admin mode access on GraphiQL controller
+merge_request: 29845
+author: Diego Louzán
+type: fixed
diff --git a/doc/api/metrics_dashboard_annotations.md b/doc/api/metrics_dashboard_annotations.md
index 8cfd4dc8eed..a4d5985803f 100644
--- a/doc/api/metrics_dashboard_annotations.md
+++ b/doc/api/metrics_dashboard_annotations.md
@@ -4,16 +4,6 @@
Metrics dashboard annotations allow you to indicate events on your graphs at a single point in time or over a timespan.
-## Enable the metrics dashboard annotations API
-
-The `:metrics_dashboard_annotations` feature flag is disabled by default.
-To turn on this API, ask a GitLab administrator with Rails console
-access to run the following command:
-
-```ruby
-Feature.enable(:metrics_dashboard_annotations)
-```
-
## Create a new annotation
```plaintext
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 48df539ed88..ec35eef0dcc 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -9,10 +9,8 @@ Values for the project visibility level are:
- `private`:
Project access must be granted explicitly for each user.
-
- `internal`:
The project can be cloned by any logged in user.
-
- `public`:
The project can be accessed without any authentication.
@@ -22,11 +20,9 @@ There are currently three options for `merge_method` to choose from:
- `merge`:
A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
-
- `rebase_merge`:
A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible.
This way you could make sure that if this merge request would build, after merging to target branch it would also build.
-
- `ff`:
No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.
diff --git a/doc/development/fe_guide/vue.md b/doc/development/fe_guide/vue.md
index ce5e14bfe87..972c2ded9c9 100644
--- a/doc/development/fe_guide/vue.md
+++ b/doc/development/fe_guide/vue.md
@@ -189,92 +189,97 @@ Each Vue component has a unique output. This output is always present in the ren
Although we can test each method of a Vue component individually, our goal must be to test the output
of the render/template function, which represents the state at all times.
-Make use of the [axios mock adapter](axios.md#mock-axios-response-in-tests) to mock data returned.
-
-Here's how we would test the Todo App above:
+Here's an example of a well structured unit test for [this Vue component](#appendix---vue-component-subject-under-test):
```javascript
-import Vue from 'vue';
-import axios from '~/lib/utils/axios_utils';
+import { shallowMount } from '@vue/test-utils';
+import { GlLoadingIcon } from '@gitlab/ui';
import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
+import App from '~/todos/app.vue';
-describe('Todos App', () => {
- let vm;
+const TEST_TODOS = [
+ { text: 'Lorem ipsum test text' },
+ { text: 'Lorem ipsum 2' },
+];
+const TEST_NEW_TODO = 'New todo title';
+const TEST_TODO_PATH = '/todos';
+
+describe('~/todos/app.vue', () => {
+ let wrapper;
let mock;
beforeEach(() => {
- // Create a mock adapter for stubbing axios API requests
+ // IMPORTANT: Use axios-mock-adapter for stubbing axios API requests
mock = new MockAdapter(axios);
-
- const Component = Vue.extend(component);
-
- // Mount the Component
- vm = new Component().$mount();
+ mock.onGet(TEST_TODO_PATH).reply(200, TEST_TODOS);
+ mock.onPost(TEST_TODO_PATH).reply(200);
});
afterEach(() => {
- // Reset the mock adapter
+ // IMPORTANT: Clean up the component instance and axios mock adapter
+ wrapper.destroy();
+ wrapper = null;
+
mock.restore();
- // Destroy the mounted component
- vm.$destroy();
});
- it('should render the loading state while the request is being made', () => {
- expect(vm.$el.querySelector('i.fa-spin')).toBeDefined();
- });
-
- it('should render todos returned by the endpoint', done => {
- // Mock the get request on the API endpoint to return data
- mock.onGet('/todos').replyOnce(200, [
- {
- title: 'This is a todo',
- text: 'This is the text',
+ // NOTE: It is very helpful to separate setting up the component from
+ // its collaborators (i.e. Vuex, axios, etc.)
+ const createWrapper = (props = {}) => {
+ wrapper = shallowMount(App, {
+ propsData: {
+ path: TEST_TODO_PATH,
+ ...props,
},
- ]);
+ });
+ };
+ // NOTE: Helper methods greatly help test maintainability and readability.
+ const findLoader = () => wrapper.find(GlLoadingIcon);
+ const findAddButton = () => wrapper.find('[data-testid="add-button"]');
+ const findTextInput = () => wrapper.find('[data-testid="text-input"]');
+ const findTodoData = () => wrapper.findAll('[data-testid="todo-item"]').wrappers.map(wrapper => ({ text: wrapper.text() }));
- Vue.nextTick(() => {
- const items = vm.$el.querySelectorAll('.js-todo-list div')
- expect(items.length).toBe(1);
- expect(items[0].textContent).toContain('This is the text');
- done();
+ describe('when mounted and loading', () => {
+ beforeEach(() => {
+ // Create request which will never resolve
+ mock.onGet(TEST_TODO_PATH).reply(() => new Promise(() => {}));
+ createWrapper();
+ });
+
+ it('should render the loading state', () => {
+ expect(findLoader().exists()).toBe(true);
});
});
- it('should add a todos on button click', (done) => {
-
- // Mock the put request and check that the sent data object is correct
- mock.onPut('/todos').replyOnce((req) => {
- expect(req.data).toContain('text');
- expect(req.data).toContain('title');
-
- return [201, {}];
+ describe('when todos are loaded', () => {
+ beforeEach(() => {
+ createWrapper();
+ // IMPORTANT: This component fetches data asynchronously on mount, so let's wait for the Vue template to update
+ return wrapper.vm.$nextTick();
});
- vm.$el.querySelector('.js-add-todo').click();
+ it('should not show loading', () => {
+ expect(findLoader().exists()).toBe(false);
+ });
- // Add a new interceptor to mock the add Todo request
- Vue.nextTick(() => {
- expect(vm.$el.querySelectorAll('.js-todo-list div').length).toBe(2);
- done();
+ it('should render todos', () => {
+ expect(findTodoData()).toEqual(TEST_TODOS);
+ });
+
+ it('when todo is added, should post new todo', () => {
+ findTextInput().vm.$emit('update', TEST_NEW_TODO)
+ findAddButton().vm.$emit('click');
+
+ return wrapper.vm.$nextTick()
+ .then(() => {
+ expect(mock.history.post.map(x => JSON.parse(x.data))).toEqual([{ text: TEST_NEW_TODO }]);
+ });
});
});
});
```
-### `mountComponent` helper
-
-There is a helper in `spec/javascripts/helpers/vue_mount_component_helper.js` that allows you to mount a component with the given props:
-
-```javascript
-import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper'
-import component from 'component.vue'
-
-const Component = Vue.extend(component);
-const data = {prop: 'foo'};
-const vm = mountComponent(Component, data);
-```
-
### Test the component's output
The main return value of a Vue component is the rendered output. In order to test the component we
@@ -336,3 +341,35 @@ Currently, we recommend to minimize adding certain features to the codebase to p
- `slot` attributes
You can find more details on [Migration to Vue 3](vue3_migration.md)
+
+## Appendix - Vue component subject under test
+
+This is the template for the example component which is tested in the [Testing Vue components](#testing-vue-components) section:
+
+```html
+
+
+
+
+ {{ toddo.text }}
+
+
+