Skip to content
Snippets Groups Projects
Commit fe022014 authored by Alessio Caiazza's avatar Alessio Caiazza
Browse files

Revert "Add latest changes from gitlab-org/gitlab@12-0-stable-ee"

This reverts commit a21e4112
parent a21e4112
No related branches found
No related tags found
No related merge requests found
Showing
with 8 additions and 59 deletions
import $ from 'jquery';
import 'at.js';
import _ from 'underscore';
import glRegexp from './lib/utils/regexp';
import AjaxCache from './lib/utils/ajax_cache';
 
Loading
Loading
Loading
Loading
@@ -33,9 +33,6 @@ import GlFieldErrors from './gl_field_errors';
import initUserPopovers from './user_popovers';
import { __ } from './locale';
 
// EE-only scripts
import 'ee/main';
// expose jQuery as global (TODO: remove these)
window.jQuery = jQuery;
window.$ = jQuery;
Loading
Loading
Loading
Loading
@@ -37,11 +37,6 @@ export default {
required: false,
default: false,
},
packagesAvailable: {
type: Boolean,
required: false,
default: false,
},
visibilityHelpPath: {
type: String,
required: false,
Loading
Loading
@@ -72,11 +67,6 @@ export default {
required: false,
default: '',
},
packagesHelpPath: {
type: String,
required: false,
default: '',
},
},
 
data() {
Loading
Loading
@@ -92,7 +82,6 @@ export default {
pagesAccessLevel: 20,
containerRegistryEnabled: true,
lfsEnabled: true,
packagesEnabled: true,
requestAccessEnabled: true,
highlightChangesClass: false,
};
Loading
Loading
@@ -168,14 +157,12 @@ export default {
if (value === 0) {
this.containerRegistryEnabled = false;
this.lfsEnabled = false;
this.packagesEnabled = false;
}
} else if (oldValue === 0) {
this.mergeRequestsAccessLevel = value;
this.buildsAccessLevel = value;
this.containerRegistryEnabled = true;
this.lfsEnabled = true;
this.packagesEnabled = true;
}
},
 
Loading
Loading
@@ -312,18 +299,6 @@ export default {
name="project[lfs_enabled]"
/>
</project-setting-row>
<project-setting-row
v-if="packagesAvailable"
:help-path="packagesHelpPath"
label="Packages"
help-text="Every project can have its own space to store its packages"
>
<project-feature-toggle
v-model="packagesEnabled"
:disabled-input="!repositoryEnabled"
name="project[packages_enabled]"
/>
</project-setting-row>
</div>
<project-setting-row label="Wiki" help-text="Pages for project documentation">
<project-feature-setting
Loading
Loading
Loading
Loading
@@ -2,8 +2,8 @@ import Visibility from 'visibilityjs';
import Flash from '../flash';
import Poll from '../lib/utils/poll';
import { __ } from '../locale';
import PipelineService from '~/pipelines/services/pipeline_service';
import PipelineStore from 'ee/pipelines/stores/pipeline_store'; // eslint-disable-line import/order
import PipelineStore from './stores/pipeline_store';
import PipelineService from './services/pipeline_service';
 
export default class pipelinesMediator {
constructor(options = {}) {
Loading
Loading
<script>
import IssueStatusIcon from '~/reports/components/issue_status_icon.vue';
import { components, componentNames } from 'ee/vue_shared/components/reports/issue_body';
import { components, componentNames } from '~/reports/components/issue_body';
 
export default {
name: 'ReportItem',
Loading
Loading
Loading
Loading
@@ -65,6 +65,9 @@ export default {
:title="timeRemainingTooltip"
:class="timeRemainingStatusClass"
class="compare-meter"
data-toggle="tooltip"
data-placement="top"
role="timeRemainingDisplay"
>
<gl-progress-bar :value="timeRemainingPercent" :variant="progressBarVariant" />
<div class="compare-display-container">
Loading
Loading
import Store from 'ee/sidebar/stores/sidebar_store';
import { visitUrl } from '../lib/utils/url_utility';
import Flash from '../flash';
import Service from './services/sidebar_service';
import Store from './stores/sidebar_store';
import { __ } from '~/locale';
 
export default class SidebarMediator {
Loading
Loading
Loading
Loading
@@ -92,6 +92,7 @@ export default {
},
};
</script>
<template>
<div class="ci-widget media js-ci-widget">
<template v-if="!hasPipeline || hasCIError">
Loading
Loading
@@ -190,7 +191,6 @@ export default {
</div>
</template>
</span>
<linked-pipelines-mini-list v-if="triggered.length" :triggered="triggered" />
</span>
</div>
Loading
Loading
Loading
Loading
@@ -9,7 +9,6 @@ export default {
directives: {
GlTooltip: GlTooltipDirective,
},
props: {
endDateString: {
type: String,
Loading
Loading
Loading
Loading
@@ -34,8 +34,4 @@
// Styles for JS behaviors.
@import "behaviors";
 
// EE-only stylesheets
@import "../../../ee/app/assets/stylesheets/**/*";
// CSS util classes
@import "utilities";
Loading
Loading
@@ -8,5 +8,3 @@ class Admin::ApplicationController < ApplicationController
 
layout 'admin'
end
Admin::ApplicationController.prepend(EE::Admin::ApplicationController)
Loading
Loading
@@ -158,5 +158,3 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
]
end
end
Admin::ApplicationSettingsController.prepend(EE::Admin::ApplicationSettingsController)
Loading
Loading
@@ -15,5 +15,3 @@ class Admin::DashboardController < Admin::ApplicationController
end
# rubocop: enable CodeReuse/ActiveRecord
end
Admin::DashboardController.prepend(EE::Admin::DashboardController)
Loading
Loading
@@ -94,5 +94,3 @@ class Admin::GroupsController < Admin::ApplicationController
]
end
end
Admin::GroupsController.prepend(EE::Admin::GroupsController)
Loading
Loading
@@ -11,5 +11,3 @@ class Admin::HealthCheckController < Admin::ApplicationController
['standard']
end
end
Admin::HealthCheckController.prepend(EE::Admin::HealthCheckController)
Loading
Loading
@@ -20,5 +20,3 @@ class Admin::LogsController < Admin::ApplicationController
]
end
end
Admin::LogsController.prepend(EE::Admin::LogsController)
Loading
Loading
@@ -76,5 +76,3 @@ class Admin::ProjectsController < Admin::ApplicationController
@group ||= @project.group
end
end
Admin::ProjectsController.prepend(EE::Admin::ProjectsController)
Loading
Loading
@@ -237,5 +237,3 @@ class Admin::UsersController < Admin::ApplicationController
access_denied! unless Gitlab.config.gitlab.impersonation_enabled
end
end
Admin::UsersController.prepend(EE::Admin::UsersController)
Loading
Loading
@@ -517,5 +517,3 @@ class ApplicationController < ActionController::Base
Gitlab::Sentry.context(current_user)
end
end
ApplicationController.prepend(EE::ApplicationController)
Loading
Loading
@@ -46,5 +46,3 @@ class AutocompleteController < ApplicationController
render json: target_branches.map { |target_branch| { title: target_branch } }
end
end
AutocompleteController.prepend(EE::AutocompleteController)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment