Mise à jour de quelques éléments de style, pour le nouveau rubocop

recurrent
echarp 8 years ago
parent 0ce1a42f5e
commit 0f774d15ef
  1. 5
      Gemfile
  2. 1
      Guardfile
  3. 5
      app/views/events/index.json.jbuilder
  4. 5
      app/views/events/show.json.jbuilder
  5. 3
      app/views/users/show.json.jbuilder
  6. 2
      db/migrate/20131114103118_devise_create_admin_users.rb
  7. 2
      db/migrate/20131114103121_create_active_admin_comments.rb
  8. 2
      db/seeds.rb

@ -1,6 +1,5 @@
source 'https://rubygems.org'
gem 'rails', '~> 4.1.0.rc1'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.1'
@ -55,8 +54,8 @@ gem 'devise-i18n'
gem 'rails-i18n'
# Store some specific content, like application name and static pages contents
gem 'i18n-active_record',
git: 'git://github.com/svenfuchs/i18n-active_record.git',
require: 'i18n/active_record'
git: 'git://github.com/svenfuchs/i18n-active_record.git',
require: 'i18n/active_record'
# A superb font to use as icons
gem 'font-awesome-rails'
# Validate mails submitted

@ -1,6 +1,7 @@
# A sample Guardfile
# More info at https://github.com/guard/guard#readme
# rubocop:disable all
guard :livereload do
watch(%r{app/views/.+\.(erb|haml|slim)$})
watch(%r{app/helpers/.+\.rb})

@ -1,4 +1,7 @@
json.array!(@events) do |event|
json.extract! event, :id, :title, :description, :start_time, :end_time, :city, :region_id, :locality, :url, :contact, :contact, :submitter, :moderated, :tags, :secret, :decision_time, :submission_time, :moderator_mail_id, :submitter_mail_id
json.extract! event, :id, :title, :description, :start_time, :end_time,
:city, :region_id, :locality, :url, :contact, :contact,
:submitter, :moderated, :tags, :secret, :decision_time,
:submission_time, :moderator_mail_id, :submitter_mail_id
json.url event_url(event, format: :json)
end

@ -1 +1,4 @@
json.extract! @event, :id, :title, :description, :start_time, :end_time, :city, :region_id, :locality, :url, :contact, :contact, :submitter, :moderated, :tags, :secret, :decision_time, :submission_time, :moderator_mail_id, :submitter_mail_id, :created_at, :updated_at
json.extract! @event, :id, :title, :description, :start_time, :end_time, :city,
:region_id, :locality, :url, :contact, :contact, :submitter,
:moderated, :tags, :secret, :decision_time, :submission_time,
:moderator_mail_id, :submitter_mail_id, :created_at, :updated_at

@ -1 +1,2 @@
json.extract! @user, :login, :email, :lastname, :firstname, :created_at, :updated_at
json.extract! @user, :login, :email, :lastname, :firstname, :created_at,
:updated_at

@ -7,7 +7,7 @@ class DeviseCreateAdminUsers < ActiveRecord::Migration
password_confirmation: 'password') if direction == :up
end
# rubocop:disable Style/MethodLength
# rubocop:disable Metrics/MethodLength
def change
create_table(:admin_users) do |t|
## Database authenticatable

@ -1,6 +1,6 @@
# Add comments for administrators to internally share about any item
class CreateActiveAdminComments < ActiveRecord::Migration
# rubocop:disable Style/MethodLength
# rubocop:disable Metrics/MethodLength
def self.up
create_table :active_admin_comments do |t|
t.string :namespace

@ -18,7 +18,7 @@ User.create login: 'admin@example.com', email: 'admin@example.com',
AdminUser.create email: 'admin@example.com', password: 'password'
# rubocop:disable Style/LineLength
# rubocop:disable Metrics/LineLength
I18n::Backend::ActiveRecord::Translation.create([
{ locale: 'fr', key: 'layouts.application.subtitle',
value: 'Les événements du Libre en France' },

Loading…
Cancel
Save