diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 45457a6b..0d9a6f13 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -42,13 +42,6 @@ Layout/CommentIndentation: - 'app/models/track.rb' - 'spec/features/volunteers_spec.rb' -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: AllowBorderComment, AllowMarginComment. -Layout/EmptyComment: - Exclude: - - 'config/initializers/formtastic.rb' - # Offense count: 3 # Cop supports --auto-correct. Layout/EmptyLineAfterGuardClause: @@ -1005,7 +998,6 @@ Style/EmptyMethod: Style/Encoding: Exclude: - 'app/uploaders/picture_uploader.rb' - - 'config/initializers/formtastic.rb' - 'spec/models/conference_spec.rb' # Offense count: 3 diff --git a/Gemfile b/Gemfile index 3f9b7182..bc221407 100644 --- a/Gemfile +++ b/Gemfile @@ -85,8 +85,6 @@ gem 'uglifier', '>= 1.3.0' gem 'autoprefixer-rails' gem 'bootstrap-sass', '~> 3.4.0' gem 'cocoon' -gem 'formtastic', '~> 3.1.5' -gem 'formtastic-bootstrap' # as the JavaScript library gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index c4caaf9a..d6b86f5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,10 +219,6 @@ GEM ffi (1.15.4) font-awesome-rails (4.7.0.7) railties (>= 3.2, < 7) - formtastic (3.1.5) - actionpack (>= 3.2.13) - formtastic-bootstrap (3.1.1) - formtastic (>= 3.0) geckodriver-helper (0.24.0) archive-zip (~> 0.7) globalid (0.4.2) @@ -644,8 +640,6 @@ DEPENDENCIES faker feature font-awesome-rails - formtastic (~> 3.1.5) - formtastic-bootstrap geckodriver-helper gravtastic haml-rails diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 4eb5fb1d..0e8acc2e 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -243,10 +243,6 @@ GEM ffi (1.15.3) font-awesome-rails (4.7.0.8) railties (>= 3.2, < 8.0) - formtastic (3.1.5) - actionpack (>= 3.2.13) - formtastic-bootstrap (3.1.1) - formtastic (>= 3.0) geckodriver-helper (0.24.0) archive-zip (~> 0.7) globalid (1.0.0) @@ -681,8 +677,6 @@ DEPENDENCIES faker feature font-awesome-rails - formtastic (~> 3.1.5) - formtastic-bootstrap geckodriver-helper gravtastic haml-rails diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 567fa050..3594e187 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,6 +1,5 @@ /* *= require strap-on - *= require formtastic-bootstrap *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap *= require osem *= require osem-rating diff --git a/config/initializers/formtastic.rb b/config/initializers/formtastic.rb deleted file mode 100644 index f21da2e7..00000000 --- a/config/initializers/formtastic.rb +++ /dev/null @@ -1,113 +0,0 @@ -# encoding: utf-8 - -# Set the default text field size when input is a string. Default is nil. -# Formtastic::FormBuilder.default_text_field_size = 50 - -# Set the default text area height when input is a text. Default is 20. -# Formtastic::FormBuilder.default_text_area_height = 5 - -# Set the default text area width when input is a text. Default is nil. -# Formtastic::FormBuilder.default_text_area_width = 50 - -# Should all fields be considered "required" by default? -# Defaults to true. -# Formtastic::FormBuilder.all_fields_required_by_default = true - -# Should select fields have a blank option/prompt by default? -# Defaults to true. -Formtastic::FormBuilder.include_blank_for_select_by_default = false - -# Set the string that will be appended to the labels/fieldsets which are required -# It accepts string or procs and the default is a localized version of -# '*'. In other words, if you configure formtastic.required -# in your locale, it will replace the abbr title properly. But if you don't want to use -# abbr tag, you can simply give a string as below -Formtastic::FormBuilder.required_string = proc { Formtastic::Util.html_safe(%{ *}) } - -# Set the string that will be appended to the labels/fieldsets which are optional -# Defaults to an empty string ("") and also accepts procs (see required_string above) -# Formtastic::FormBuilder.optional_string = "(optional)" - -# Set the way inline errors will be displayed. -# Defaults to :sentence, valid options are :sentence, :list, :first and :none -# Formtastic::FormBuilder.inline_errors = :sentence -# Formtastic uses the following classes as default for hints, inline_errors and error list - -# If you override the class here, please ensure to override it in your stylesheets as well -# Formtastic::FormBuilder.default_hint_class = "inline-hints" -# Formtastic::FormBuilder.default_inline_error_class = "inline-errors" -# Formtastic::FormBuilder.default_error_list_class = "errors" - -# Set the method to call on label text to transform or format it for human-friendly -# reading when formtastic is used without object. Defaults to :humanize. -# Formtastic::FormBuilder.label_str_method = :humanize - -# Set the array of methods to try calling on parent objects in :select and :radio inputs -# for the text inside each @