diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-17 12:58:44 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-17 12:58:44 +0200 |
| commit | 2428a0b2dd8e84e285df4b356ee6f1593204cd34 (patch) | |
| tree | 7ab25265e2779909f3d414f3169b6c0af905f479 | |
| parent | 86a8796b1322879d01e9cea8fb728458e0e328cb (diff) | |
| download | gitlab-ce-2428a0b2dd8e84e285df4b356ee6f1593204cd34.tar.gz | |
Add project_services dir to autoload path
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/models/project.rb | 8 | ||||
| -rw-r--r-- | app/models/project_services/emails_on_push_service.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 2 | ||||
| -rw-r--r-- | config/application.rb | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index d55714662b2..51f7e949535 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -23,14 +23,6 @@ # visibility_level :integer default(0), not null # -require_relative "project_services/assembla_service" -require_relative "project_services/campfire_service" -require_relative "project_services/emails_on_push_service" -require_relative "project_services/flowdock_service" -require_relative "project_services/gitlab_ci_service" -require_relative "project_services/hipchat_service" -require_relative "project_services/pivotaltracker_service" - class Project < ActiveRecord::Base include Gitlab::ShellAdapter include Gitlab::VisibilityLevel diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb index c01748a81b0..5ead0f2b730 100644 --- a/app/models/project_services/emails_on_push_service.rb +++ b/app/models/project_services/emails_on_push_service.rb @@ -38,7 +38,7 @@ class EmailsOnPushService < Service def fields [ - { type: 'textarea', name: 'recipients', placeholder: 'Recipients' }, + { type: 'textarea', name: 'recipients', placeholder: 'Emails separated by whitespace' }, ] end end diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index e220d6a3185..2e2e5f41dd8 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -34,7 +34,7 @@ - if type == 'text' = f.text_field name, class: "input-xlarge", placeholder: placeholder - elsif type == 'textarea' - = f.textarea name, rows: 5 + = f.text_area name, rows: 5, class: "input-xlarge", placeholder: placeholder - elsif type == 'checkbox' = f.check_box name diff --git a/config/application.rb b/config/application.rb index dec1940a4a3..1c91134f524 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,7 +12,7 @@ module Gitlab # -- all .rb files in that directory are automatically loaded. # Custom directories with classes and modules you want to be autoloadable. - config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/models/concerns) + config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/models/concerns #{config.root}/app/models/project_services) # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. |