agenda-libre/agenda-libre-ruby
agenda-libre
/
agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Bundle update and rubocop cleanup

This commit is contained in:
echarp 2017-09-17 11:14:49 +02:00
parent e6ae709ce4
commit 85b4ac888f
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gemfile.lock
View File

@ -210,7 +210,7 @@ GEM
activerecord activerecord
kaminari-core (= 1.0.1) kaminari-core (= 1.0.1)
kaminari-core (1.0.1) kaminari-core (1.0.1)
kramdown (1.14.0) kramdown (1.15.0)
libv8 (3.16.14.19) libv8 (3.16.14.19)
listen (3.1.5) listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
@ -301,7 +301,7 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.2.2) rainbow (2.2.2)
rake rake
rake (12.0.0) rake (12.1.0)
ransack (1.8.3) ransack (1.8.3)
actionpack (>= 3.0) actionpack (>= 3.0)
activerecord (>= 3.0) activerecord (>= 3.0)
@ -317,14 +317,14 @@ GEM
responders (2.4.0) responders (2.4.0)
actionpack (>= 4.2.0, < 5.3) actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3)
rubocop (0.49.1) rubocop (0.50.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0) parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1) unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1) ruby-progressbar (1.8.3)
ruby_dep (1.5.0) ruby_dep (1.5.0)
ruby_parser (3.10.1) ruby_parser (3.10.1)
sexp_processor (~> 4.9) sexp_processor (~> 4.9)
@ -347,7 +347,7 @@ GEM
simple_calendar (2.2.7) simple_calendar (2.2.7)
rails (>= 3.0) rails (>= 3.0)
simple_oauth (0.3.1) simple_oauth (0.3.1)
simplecov (0.15.0) simplecov (0.15.1)
docile (~> 1.1.0) docile (~> 1.1.0)
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)

2
app/models/city.rb
View File

@ -3,6 +3,4 @@
# It is mainly used to manage coordinates # It is mainly used to manage coordinates
# #
class City < ApplicationRecord class City < ApplicationRecord
has_many :events, foreign_key: :city, primary_key: :name
has_many :orgas, foreign_key: :city, primary_key: :name
end end

2
app/models/kind.rb
View File

@ -1,4 +1,4 @@
# Gives the possibility to organise organisations! :) # Gives the possibility to organise organisations! :)
class Kind < ApplicationRecord class Kind < ApplicationRecord
has_many :orgas has_many :orgas, dependent: :destroy
end end

4
app/models/region.rb
View File

@ -1,9 +1,9 @@
# This is mostly to group events around a region # This is mostly to group events around a region
class Region < ApplicationRecord class Region < ApplicationRecord
belongs_to :region belongs_to :region
has_many :regions has_many :regions, dependent: :nullify
has_many :orgas has_many :orgas, dependent: :destroy
default_scope { order :name } default_scope { order :name }

2
app/models/user.rb
View File

@ -8,8 +8,6 @@ class User < ApplicationRecord
devise :database_authenticatable, authentication_keys: [:login] devise :database_authenticatable, authentication_keys: [:login]
# :registerable, :validatable # :registerable, :validatable
has_many :notes
validates :login, presence: true validates :login, presence: true
def encrypted_password=(pass) def encrypted_password=(pass)

2
db/seeds.rb
View File

@ -1,5 +1,3 @@
# encoding: utf-8
# This file should contain all the record creation needed to seed the database # This file should contain all the record creation needed to seed the database
# with its default values. # with its default values.
# The data can then be loaded with the rake db:seed (or created alongside the # The data can then be loaded with the rake db:seed (or created alongside the