Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-23 15:10:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-23 15:10:26 +0300
commit5c9f6c66fabf22927e862b2b60362e4ea25b250b (patch)
tree6ff391dcb7fdd3126f71af9fa4ca5e776a9ecbe3 /app/assets/javascripts/projects
parent65fdda8d39a9af414dbe5aa3a385b9bcba00960b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/projects')
-rw-r--r--app/assets/javascripts/projects/commit_box/info/init_details_button.js4
-rw-r--r--app/assets/javascripts/projects/experiment_new_project_creation/index.js2
-rw-r--r--app/assets/javascripts/projects/project_new.js9
-rw-r--r--app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue5
4 files changed, 5 insertions, 15 deletions
diff --git a/app/assets/javascripts/projects/commit_box/info/init_details_button.js b/app/assets/javascripts/projects/commit_box/info/init_details_button.js
index 032fbf5316a..833e946af5c 100644
--- a/app/assets/javascripts/projects/commit_box/info/init_details_button.js
+++ b/app/assets/javascripts/projects/commit_box/info/init_details_button.js
@@ -3,9 +3,7 @@ import $ from 'jquery';
export const initDetailsButton = () => {
$('body').on('click', '.js-details-expand', function expand(e) {
e.preventDefault();
- $(this)
- .next('.js-details-content')
- .removeClass('hide');
+ $(this).next('.js-details-content').removeClass('hide');
$(this).hide();
});
};
diff --git a/app/assets/javascripts/projects/experiment_new_project_creation/index.js b/app/assets/javascripts/projects/experiment_new_project_creation/index.js
index 3715c52b6b9..06920a5ab19 100644
--- a/app/assets/javascripts/projects/experiment_new_project_creation/index.js
+++ b/app/assets/javascripts/projects/experiment_new_project_creation/index.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import NewProjectCreationApp from './components/app.vue';
-export default function(el, props) {
+export default function (el, props) {
return new Vue({
el,
components: {
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js
index d54a48cc444..36021c5ca20 100644
--- a/app/assets/javascripts/projects/project_new.js
+++ b/app/assets/javascripts/projects/project_new.js
@@ -91,9 +91,7 @@ const bindEvents = () => {
$('.how_to_import_link').on('click', e => {
e.preventDefault();
- $(e.currentTarget)
- .next('.modal')
- .show();
+ $(e.currentTarget).next('.modal').show();
});
$('.modal-header .close').on('click', () => {
@@ -151,10 +149,7 @@ const bindEvents = () => {
const selectedTemplate = DEFAULT_PROJECT_TEMPLATES[value];
$selectedTemplateText.text(selectedTemplate.text);
- $(selectedTemplate.icon)
- .clone()
- .addClass('d-block')
- .appendTo($selectedIcon);
+ $(selectedTemplate.icon).clone().addClass('d-block').appendTo($selectedIcon);
const $activeTabProjectName = $('.tab-pane.active #project_name');
const $activeTabProjectPath = $('.tab-pane.active #project_path');
diff --git a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
index e582d5c3e47..9788a32dcbd 100644
--- a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
+++ b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
@@ -83,10 +83,7 @@ export default {
});
},
fetchPipelineCommitData() {
- this.service
- .fetchData()
- .then(this.successCallback)
- .catch(this.errorCallback);
+ this.service.fetchData().then(this.successCallback).catch(this.errorCallback);
},
},
};