diff --git a/Gemfile b/Gemfile index 39234b05e..37ce76624 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'net-ssh' gem 'jenkins_api_client' gem 'nokogiri' -gem 'certified' +# gem 'certified' gem 'wechat',path: 'lib/wechat' gem 'grack', path:'lib/grack' diff --git a/app/controllers/quality_analyses_controller.rb b/app/controllers/quality_analysis_controller.rb similarity index 96% rename from app/controllers/quality_analyses_controller.rb rename to app/controllers/quality_analysis_controller.rb index 962ce2524..0eff67be7 100644 --- a/app/controllers/quality_analyses_controller.rb +++ b/app/controllers/quality_analysis_controller.rb @@ -1,4 +1,4 @@ -class QualityAnalysesController < ApplicationController +class QualityAnalysisController < ApplicationController before_filter :find_project_by_project_id#, :except => [:getattachtype] layout "base_projects" include ApplicationHelper diff --git a/app/helpers/quality_analyses_helper.rb b/app/helpers/quality_analyses_helper.rb deleted file mode 100644 index a47f571bb..000000000 --- a/app/helpers/quality_analyses_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module QualityAnalysesHelper -end diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb new file mode 100644 index 000000000..f2a1effba --- /dev/null +++ b/app/helpers/quality_analysis_helper.rb @@ -0,0 +1,2 @@ +module QualityAnalysisHelper +end diff --git a/app/views/quality_analyses/index.html.erb b/app/views/quality_analysis/index.html.erb similarity index 100% rename from app/views/quality_analyses/index.html.erb rename to app/views/quality_analysis/index.html.erb diff --git a/app/views/repositories/_quality_analyses.html.erb b/app/views/repositories/_quality_analyses.html.erb index 56951f3b6..bf45ba167 100644 --- a/app/views/repositories/_quality_analyses.html.erb +++ b/app/views/repositories/_quality_analyses.html.erb @@ -1,4 +1,4 @@ -<%= form_tag( url_for(:controller => 'quality_analyses', :action => 'create', :project_id => @project.id), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %> +<%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id), :remote => true , :class => 'resourcesSearchloadBox mt10', :id => 'quality_analyses_form') do %> <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch' %> <%= select_tag :language, options_for_select(["Java","C","PHP", "Web"]), :id => 'branch' %> diff --git a/config/routes.rb b/config/routes.rb index b32816673..52629604c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -782,7 +782,7 @@ RedmineApp::Application.routes.draw do end end - resources :quality_analyses, :only => [:index, :new, :create] do + resources :quality_analysis, :only => [:index, :new, :create] do collection do end member do @@ -909,7 +909,7 @@ RedmineApp::Application.routes.draw do # repositories routes get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats', :as => "stats_repository_project" - get 'projects/:id/repository/:repository_id/quality_analyses', :to => 'repositories#quality_analyses', :as => "quality_analyses" + get 'projects/:id/repository/:repository_id/quality_analysis', :to => 'repositories#quality_analysis', :as => "quality_analysis" get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph' get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))', :to => 'repositories#changes' diff --git a/spec/controllers/quality_analyses_controller_spec.rb b/spec/controllers/quality_analyses_controller_spec.rb deleted file mode 100644 index c5076c53f..000000000 --- a/spec/controllers/quality_analyses_controller_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe QualityAnalysesController, :type => :controller do - -end diff --git a/spec/controllers/quality_analysis_controller_spec.rb b/spec/controllers/quality_analysis_controller_spec.rb new file mode 100644 index 000000000..d25575a85 --- /dev/null +++ b/spec/controllers/quality_analysis_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe QualityAnalysisController, :type => :controller do + +end