diff options
Diffstat (limited to 'app/controllers/admin')
-rw-r--r-- | app/controllers/admin/application_controller.rb | 11 | ||||
-rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 45 | ||||
-rw-r--r-- | app/controllers/admin/applications_controller.rb | 52 | ||||
-rw-r--r-- | app/controllers/admin/background_jobs_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/admin/broadcast_messages_controller.rb | 39 | ||||
-rw-r--r-- | app/controllers/admin/dashboard_controller.rb | 7 | ||||
-rw-r--r-- | app/controllers/admin/deploy_keys_controller.rb | 49 | ||||
-rw-r--r-- | app/controllers/admin/groups_controller.rb | 64 | ||||
-rw-r--r-- | app/controllers/admin/hooks_controller.rb | 44 | ||||
-rw-r--r-- | app/controllers/admin/keys_controller.rb | 34 | ||||
-rw-r--r-- | app/controllers/admin/logs_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/admin/projects_controller.rb | 44 | ||||
-rw-r--r-- | app/controllers/admin/services_controller.rb | 54 | ||||
-rw-r--r-- | app/controllers/admin/users_controller.rb | 128 |
14 files changed, 0 insertions, 579 deletions
diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb deleted file mode 100644 index 6a8f20f6047..00000000000 --- a/app/controllers/admin/application_controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -# Provides a base class for Admin controllers to subclass -# -# Automatically sets the layout and ensures an administrator is logged in -class Admin::ApplicationController < ApplicationController - layout 'admin' - before_filter :authenticate_admin! - - def authenticate_admin! - return render_404 unless current_user.is_admin? - end -end diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb deleted file mode 100644 index b5fda196bf0..00000000000 --- a/app/controllers/admin/application_settings_controller.rb +++ /dev/null @@ -1,45 +0,0 @@ -class Admin::ApplicationSettingsController < Admin::ApplicationController - before_filter :set_application_setting - - def show - end - - def update - if @application_setting.update_attributes(application_setting_params) - redirect_to admin_application_settings_path, - notice: 'Application settings saved successfully' - else - render :show - end - end - - private - - def set_application_setting - @application_setting = ApplicationSetting.current - end - - def application_setting_params - restricted_levels = params[:application_setting][:restricted_visibility_levels] - if restricted_levels.nil? - params[:application_setting][:restricted_visibility_levels] = [] - else - restricted_levels.map! do |level| - level.to_i - end - end - - params.require(:application_setting).permit( - :default_projects_limit, - :default_branch_protection, - :signup_enabled, - :signin_enabled, - :gravatar_enabled, - :twitter_sharing_enabled, - :sign_in_text, - :home_page_url, - :max_attachment_size, - restricted_visibility_levels: [] - ) - end -end diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb deleted file mode 100644 index 471d24934a0..00000000000 --- a/app/controllers/admin/applications_controller.rb +++ /dev/null @@ -1,52 +0,0 @@ -class Admin::ApplicationsController < Admin::ApplicationController - before_action :set_application, only: [:show, :edit, :update, :destroy] - - def index - @applications = Doorkeeper::Application.where("owner_id IS NULL") - end - - def show - end - - def new - @application = Doorkeeper::Application.new - end - - def edit - end - - def create - @application = Doorkeeper::Application.new(application_params) - - if @application.save - flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create]) - redirect_to admin_application_url(@application) - else - render :new - end - end - - def update - if @application.update(application_params) - redirect_to admin_application_path(@application), notice: 'Application was successfully updated.' - else - render :edit - end - end - - def destroy - @application.destroy - redirect_to admin_applications_url, notice: 'Application was successfully destroyed.' - end - - private - - def set_application - @application = Doorkeeper::Application.where("owner_id IS NULL").find(params[:id]) - end - - # Only allow a trusted parameter "white list" through. - def application_params - params[:doorkeeper_application].permit(:name, :redirect_uri) - end -end diff --git a/app/controllers/admin/background_jobs_controller.rb b/app/controllers/admin/background_jobs_controller.rb deleted file mode 100644 index 338496013a0..00000000000 --- a/app/controllers/admin/background_jobs_controller.rb +++ /dev/null @@ -1,6 +0,0 @@ -class Admin::BackgroundJobsController < Admin::ApplicationController - def show - ps_output, _ = Gitlab::Popen.popen(%W(ps -U #{Gitlab.config.gitlab.user} -o pid,pcpu,pmem,stat,start,command)) - @sidekiq_processes = ps_output.split("\n").grep(/sidekiq/) - end -end diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb deleted file mode 100644 index e1643bb34bf..00000000000 --- a/app/controllers/admin/broadcast_messages_controller.rb +++ /dev/null @@ -1,39 +0,0 @@ -class Admin::BroadcastMessagesController < Admin::ApplicationController - before_filter :broadcast_messages - - def index - @broadcast_message = BroadcastMessage.new - end - - def create - @broadcast_message = BroadcastMessage.new(broadcast_message_params) - - if @broadcast_message.save - redirect_to admin_broadcast_messages_path, notice: 'Broadcast Message was successfully created.' - else - render :index - end - end - - def destroy - BroadcastMessage.find(params[:id]).destroy - - respond_to do |format| - format.html { redirect_to :back } - format.js { render nothing: true } - end - end - - protected - - def broadcast_messages - @broadcast_messages ||= BroadcastMessage.order("starts_at DESC").page(params[:page]) - end - - def broadcast_message_params - params.require(:broadcast_message).permit( - :alert_type, :color, :ends_at, :font, - :message, :starts_at - ) - end -end diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb deleted file mode 100644 index c491e5c7550..00000000000 --- a/app/controllers/admin/dashboard_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Admin::DashboardController < Admin::ApplicationController - def index - @projects = Project.limit(10) - @users = User.limit(10) - @groups = Group.limit(10) - end -end diff --git a/app/controllers/admin/deploy_keys_controller.rb b/app/controllers/admin/deploy_keys_controller.rb deleted file mode 100644 index e93603bef36..00000000000 --- a/app/controllers/admin/deploy_keys_controller.rb +++ /dev/null @@ -1,49 +0,0 @@ -class Admin::DeployKeysController < Admin::ApplicationController - before_filter :deploy_keys, only: [:index] - before_filter :deploy_key, only: [:show, :destroy] - - def index - - end - - def show - - end - - def new - @deploy_key = deploy_keys.new - end - - def create - @deploy_key = deploy_keys.new(deploy_key_params) - - if @deploy_key.save - redirect_to admin_deploy_keys_path - else - render "new" - end - end - - def destroy - deploy_key.destroy - - respond_to do |format| - format.html { redirect_to admin_deploy_keys_path } - format.json { head :ok } - end - end - - protected - - def deploy_key - @deploy_key ||= deploy_keys.find(params[:id]) - end - - def deploy_keys - @deploy_keys ||= DeployKey.are_public - end - - def deploy_key_params - params.require(:deploy_key).permit(:key, :title) - end -end diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb deleted file mode 100644 index 22d045fc388..00000000000 --- a/app/controllers/admin/groups_controller.rb +++ /dev/null @@ -1,64 +0,0 @@ -class Admin::GroupsController < Admin::ApplicationController - before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :members_update] - - def index - @groups = Group.all - @groups = @groups.sort(@sort = params[:sort]) - @groups = @groups.search(params[:name]) if params[:name].present? - @groups = @groups.page(params[:page]).per(PER_PAGE) - end - - def show - @members = @group.members.order("access_level DESC").page(params[:members_page]).per(PER_PAGE) - @projects = @group.projects.page(params[:projects_page]).per(PER_PAGE) - end - - def new - @group = Group.new - end - - def edit - end - - def create - @group = Group.new(group_params) - @group.name = @group.path.dup unless @group.name - - if @group.save - @group.add_owner(current_user) - redirect_to [:admin, @group], notice: 'Group was successfully created.' - else - render "new" - end - end - - def update - if @group.update_attributes(group_params) - redirect_to [:admin, @group], notice: 'Group was successfully updated.' - else - render "edit" - end - end - - def members_update - @group.add_users(params[:user_ids].split(','), params[:access_level], current_user) - - redirect_to [:admin, @group], notice: 'Users were successfully added.' - end - - def destroy - @group.destroy - - redirect_to admin_groups_path, notice: 'Group was successfully deleted.' - end - - private - - def group - @group = Group.find_by(path: params[:id]) - end - - def group_params - params.require(:group).permit(:name, :description, :path, :avatar) - end -end diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb deleted file mode 100644 index 0a463239d74..00000000000 --- a/app/controllers/admin/hooks_controller.rb +++ /dev/null @@ -1,44 +0,0 @@ -class Admin::HooksController < Admin::ApplicationController - def index - @hooks = SystemHook.all - @hook = SystemHook.new - end - - def create - @hook = SystemHook.new(hook_params) - - if @hook.save - redirect_to admin_hooks_path, notice: 'Hook was successfully created.' - else - @hooks = SystemHook.all - render :index - end - end - - def destroy - @hook = SystemHook.find(params[:id]) - @hook.destroy - - redirect_to admin_hooks_path - end - - - def test - @hook = SystemHook.find(params[:hook_id]) - data = { - event_name: "project_create", - name: "Ruby", - path: "ruby", - project_id: 1, - owner_name: "Someone", - owner_email: "example@gitlabhq.com" - } - @hook.execute(data) - - redirect_to :back - end - - def hook_params - params.require(:hook).permit(:url) - end -end diff --git a/app/controllers/admin/keys_controller.rb b/app/controllers/admin/keys_controller.rb deleted file mode 100644 index 21111bb44f5..00000000000 --- a/app/controllers/admin/keys_controller.rb +++ /dev/null @@ -1,34 +0,0 @@ -class Admin::KeysController < Admin::ApplicationController - before_filter :user, only: [:show, :destroy] - - def show - @key = user.keys.find(params[:id]) - - respond_to do |format| - format.html - format.js { render nothing: true } - end - end - - def destroy - key = user.keys.find(params[:id]) - - respond_to do |format| - if key.destroy - format.html { redirect_to [:admin, user], notice: 'User key was successfully removed.' } - else - format.html { redirect_to [:admin, user], alert: 'Failed to remove user key.' } - end - end - end - - protected - - def user - @user ||= User.find_by!(username: params[:user_id]) - end - - def key_params - params.require(:user_id, :id) - end -end diff --git a/app/controllers/admin/logs_controller.rb b/app/controllers/admin/logs_controller.rb deleted file mode 100644 index b999018dde4..00000000000 --- a/app/controllers/admin/logs_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Admin::LogsController < Admin::ApplicationController -end diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb deleted file mode 100644 index 5176a8399ae..00000000000 --- a/app/controllers/admin/projects_controller.rb +++ /dev/null @@ -1,44 +0,0 @@ -class Admin::ProjectsController < Admin::ApplicationController - before_filter :project, only: [:show, :transfer] - before_filter :group, only: [:show, :transfer] - before_filter :repository, only: [:show, :transfer] - - def index - @projects = Project.all - @projects = @projects.where(namespace_id: params[:namespace_id]) if params[:namespace_id].present? - @projects = @projects.where("visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present? - @projects = @projects.with_push if params[:with_push].present? - @projects = @projects.abandoned if params[:abandoned].present? - @projects = @projects.search(params[:name]) if params[:name].present? - @projects = @projects.sort(@sort = params[:sort]) - @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(PER_PAGE) - end - - def show - if @group - @group_members = @group.members.order("access_level DESC").page(params[:group_members_page]).per(PER_PAGE) - end - - @project_members = @project.project_members.page(params[:project_members_page]).per(PER_PAGE) - end - - def transfer - ::Projects::TransferService.new(@project, current_user, params.dup).execute - - @project.reload - redirect_to admin_namespace_project_path(@project.namespace, @project) - end - - protected - - def project - @project = Project.find_with_namespace( - [params[:namespace_id], '/', params[:id]].join('') - ) - @project || render_404 - end - - def group - @group ||= @project.group - end -end diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb deleted file mode 100644 index 76a938c5fe4..00000000000 --- a/app/controllers/admin/services_controller.rb +++ /dev/null @@ -1,54 +0,0 @@ -class Admin::ServicesController < Admin::ApplicationController - before_filter :service, only: [:edit, :update] - - def index - @services = services_templates - end - - def edit - unless service.present? - redirect_to admin_application_settings_services_path, - alert: "Service is unknown or it doesn't exist" - end - end - - def update - if service.update_attributes(application_services_params[:service]) - redirect_to admin_application_settings_services_path, - notice: 'Application settings saved successfully' - else - render :edit - end - end - - private - - def services_templates - templates = [] - - Service.available_services_names.each do |service_name| - service_template = service_name.concat("_service").camelize.constantize - templates << service_template.where(template: true).first_or_create - end - - templates - end - - def service - @service ||= Service.where(id: params[:id], template: true).first - end - - def application_services_params - params.permit(:id, - service: [ - :title, :token, :type, :active, :api_key, :subdomain, - :room, :recipients, :project_url, :webhook, - :user_key, :device, :priority, :sound, :bamboo_url, :username, :password, - :build_key, :server, :teamcity_url, :build_type, - :description, :issues_url, :new_issue_url, :restrict_to_branch, - :send_from_committer_email, :disable_diffs, - :push_events, :tag_push_events, :note_events, :issues_events, - :merge_requests_events - ]) - end -end diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb deleted file mode 100644 index b4c011f213c..00000000000 --- a/app/controllers/admin/users_controller.rb +++ /dev/null @@ -1,128 +0,0 @@ -class Admin::UsersController < Admin::ApplicationController - before_filter :user, only: [:show, :edit, :update, :destroy] - - def index - @users = User.order_name_asc.filter(params[:filter]) - @users = @users.search(params[:name]) if params[:name].present? - @users = @users.sort(@sort = params[:sort]) - @users = @users.page(params[:page]) - end - - def show - @personal_projects = user.personal_projects - @joined_projects = user.projects.joined(@user) - @keys = user.keys - end - - def new - @user = User.new - end - - def edit - user - end - - def block - if user.block - redirect_to :back, notice: "Successfully blocked" - else - redirect_to :back, alert: "Error occurred. User was not blocked" - end - end - - def unblock - if user.activate - redirect_to :back, notice: "Successfully unblocked" - else - redirect_to :back, alert: "Error occurred. User was not unblocked" - end - end - - def create - opts = { - force_random_password: true, - password_expires_at: nil - } - - @user = User.new(user_params.merge(opts)) - @user.created_by_id = current_user.id - @user.generate_password - @user.generate_reset_token - @user.skip_confirmation! - - respond_to do |format| - if @user.save - format.html { redirect_to [:admin, @user], notice: 'User was successfully created.' } - format.json { render json: @user, status: :created, location: @user } - else - format.html { render "new" } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end - - def update - user_params_with_pass = user_params.dup - - if params[:user][:password].present? - user_params_with_pass.merge!( - password: params[:user][:password], - password_confirmation: params[:user][:password_confirmation], - ) - end - - respond_to do |format| - user.skip_reconfirmation! - if user.update_attributes(user_params_with_pass) - format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' } - format.json { head :ok } - else - # restore username to keep form action url. - user.username = params[:id] - format.html { render "edit" } - format.json { render json: user.errors, status: :unprocessable_entity } - end - end - end - - def destroy - # 1. Remove groups where user is the only owner - user.solo_owned_groups.map(&:destroy) - - # 2. Remove user with all authored content including personal projects - user.destroy - - respond_to do |format| - format.html { redirect_to admin_users_path } - format.json { head :ok } - end - end - - def remove_email - email = user.emails.find(params[:email_id]) - email.destroy - - user.set_notification_email - user.save if user.notification_email_changed? - - respond_to do |format| - format.html { redirect_to :back, notice: "Successfully removed email." } - format.js { render nothing: true } - end - end - - protected - - def user - @user ||= User.find_by!(username: params[:id]) - end - - def user_params - params.require(:user).permit( - :email, :remember_me, :bio, :name, :username, - :skype, :linkedin, :twitter, :website_url, :color_scheme_id, :theme_id, :force_random_password, - :extern_uid, :provider, :password_expires_at, :avatar, :hide_no_ssh_key, :hide_no_password, - :projects_limit, :can_create_group, :admin, :key_id - ) - end -end |