Mise à jour de quelques éléments de style, pour le nouveau rubocop
This commit is contained in:
parent
0ce1a42f5e
commit
0f774d15ef
1
Gemfile
1
Gemfile
|
@ -1,6 +1,5 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
|
|
||||||
gem 'rails', '~> 4.1.0.rc1'
|
gem 'rails', '~> 4.1.0.rc1'
|
||||||
# Use SCSS for stylesheets
|
# Use SCSS for stylesheets
|
||||||
gem 'sass-rails', '~> 4.0.1'
|
gem 'sass-rails', '~> 4.0.1'
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
# A sample Guardfile
|
# A sample Guardfile
|
||||||
# More info at https://github.com/guard/guard#readme
|
# More info at https://github.com/guard/guard#readme
|
||||||
|
|
||||||
|
# rubocop:disable all
|
||||||
guard :livereload do
|
guard :livereload do
|
||||||
watch(%r{app/views/.+\.(erb|haml|slim)$})
|
watch(%r{app/views/.+\.(erb|haml|slim)$})
|
||||||
watch(%r{app/helpers/.+\.rb})
|
watch(%r{app/helpers/.+\.rb})
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
json.array!(@events) do |event|
|
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)
|
json.url event_url(event, format: :json)
|
||||||
end
|
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
|
password_confirmation: 'password') if direction == :up
|
||||||
end
|
end
|
||||||
|
|
||||||
# rubocop:disable Style/MethodLength
|
# rubocop:disable Metrics/MethodLength
|
||||||
def change
|
def change
|
||||||
create_table(:admin_users) do |t|
|
create_table(:admin_users) do |t|
|
||||||
## Database authenticatable
|
## Database authenticatable
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Add comments for administrators to internally share about any item
|
# Add comments for administrators to internally share about any item
|
||||||
class CreateActiveAdminComments < ActiveRecord::Migration
|
class CreateActiveAdminComments < ActiveRecord::Migration
|
||||||
# rubocop:disable Style/MethodLength
|
# rubocop:disable Metrics/MethodLength
|
||||||
def self.up
|
def self.up
|
||||||
create_table :active_admin_comments do |t|
|
create_table :active_admin_comments do |t|
|
||||||
t.string :namespace
|
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'
|
AdminUser.create email: 'admin@example.com', password: 'password'
|
||||||
|
|
||||||
# rubocop:disable Style/LineLength
|
# rubocop:disable Metrics/LineLength
|
||||||
I18n::Backend::ActiveRecord::Translation.create([
|
I18n::Backend::ActiveRecord::Translation.create([
|
||||||
{ locale: 'fr', key: 'layouts.application.subtitle',
|
{ locale: 'fr', key: 'layouts.application.subtitle',
|
||||||
value: 'Les événements du Libre en France' },
|
value: 'Les événements du Libre en France' },
|
||||||
|
|
Loading…
Reference in New Issue