Commit 6ef06abb authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@master

parent 73b594e17ed9
......@@ -51,8 +51,10 @@ rules:
no-jquery/no-serialize: error
promise/always-return: off
promise/no-callback-in-promise: off
# Make update to eslint@6 smoother:
prefer-object-spread: off
overrides:
files:
- '**/spec/**/*'
rules:
"@gitlab/i18n/no-non-i18n-strings": off
- files:
- '**/spec/**/*'
rules:
"@gitlab/i18n/no-non-i18n-strings": off
/* eslint-disable max-classes-per-file */
import $ from 'jquery';
import Pikaday from 'pikaday';
import dateFormat from 'dateformat';
......
/* eslint-disable one-var, consistent-return */
/* eslint-disable max-classes-per-file, one-var, consistent-return */
import $ from 'jquery';
import _ from 'underscore';
......
......@@ -61,7 +61,7 @@ export default {
eventHub.$emit('EnablePolling');
},
updateTimer() {
this.timer = this.timer - 1;
this.timer -= 1;
if (this.timer === 0) {
this.refresh();
......
---
title: Added migration which adds project_key column to service_desk_settings.
merge_request: 24063
author:
type: added
# frozen_string_literal: true
class AddServiceDeskProjectKey < ActiveRecord::Migration[5.2]
DOWNTIME = false
def change
add_column :service_desk_settings, :project_key, :string, limit: 255
end
end
......@@ -3797,6 +3797,7 @@
create_table "service_desk_settings", primary_key: "project_id", id: :bigint, default: nil, force: :cascade do |t|
t.string "issue_template_key", limit: 255
t.string "outgoing_name", limit: 255
t.string "project_key", limit: 255
end
create_table "services", id: :serial, force: :cascade do |t|
......
......@@ -9,6 +9,10 @@ and [deployments](../../ci/environments.md) when using [Auto DevOps](../../topic
You can install them after you
[create a cluster](../project/clusters/add_remove_clusters.md).
Interested in contributing a new GitLab managed app? Visit the
[development guidelines page](../../development/kubernetes.md#gitlab-managed-apps)
to get started.
## Installing applications
Applications managed by GitLab will be installed onto the `gitlab-managed-apps` namespace.
......
......@@ -114,15 +114,37 @@ Learn how to [create a new project](../../gitlab-basics/create-project.md) in Gi
### Fork a project
You can [fork a project](../../gitlab-basics/fork-project.md) in order to:
You can [fork a project](repository/forking_workflow.md) in order to:
- Collaborate on code by forking a project and creating a merge request
from your fork to the upstream project
- Fork a sample project to work on the top of that
### Star a project
You can star a project to make it easier to find projects you frequently use.
The number of stars a project has can indicate its popularity.
To star a project:
1. Go to the home page of the project you want to star.
1. In the upper right corner of the page, click **Star**.
To view your starred projects:
1. Click **Projects** in the navigation bar.
1. Click **Starred Projects**.
1. GitLab displays information about your starred projects, including:
- Project description, including name, description, and icon
- Number of times this project has been starred
- Number of times this project has been forked
- Number of open merge requests
- Number of open issues
## Project settings
Set the project's visibility level and the access levels to its various pages
Set the project's visibility level and the access levels to its various pages
and perform actions like archiving, renaming or transferring a project.
Read through the documentation on [project settings](settings/index.md).
......
......@@ -6,6 +6,12 @@ plugins:
extends:
- 'plugin:jest/recommended'
settings:
# We have to teach eslint-plugin-import what node modules we use
# otherwise there is an error when it tries to resolve them
import/core-modules:
- events
- fs
- path
import/resolver:
jest:
jestConfigFile: 'jest.config.js'
......
/* eslint-disable arrow-body-style */
import $ from 'jquery';
import GlFieldErrors from '~/gl_field_errors';
......
......@@ -18,7 +18,7 @@ describe('IssueAssigneesComponent', () => {
...props,
},
});
vm = wrapper.vm; // eslint-disable-line
vm = wrapper.vm;
};
const findTooltipText = () => wrapper.find('.js-assignee-tooltip').text();
......
......@@ -783,6 +783,7 @@ ZoomMeeting:
ServiceDeskSetting:
- project_id
- issue_template_key
- project_key
ContainerExpirationPolicy:
- created_at
- updated_at
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment