diff options
author | jomo <github@jomo.tv> | 2016-01-17 19:45:46 +0100 |
---|---|---|
committer | jomo <github@jomo.tv> | 2016-01-17 22:27:38 +0100 |
commit | e53228eaf15dc2d9ab5f631e312ef5132eaae747 (patch) | |
tree | 98927256e847630c8ebbc5c0d1e3cb1c41582d07 | |
parent | ce19d61e1dc45a0a55ee9f9569e5a82e1cf181ab (diff) |
update to rails 4.2.5, clean up
-rw-r--r-- | Gemfile | 17 | ||||
-rw-r--r-- | Gemfile.lock | 269 | ||||
-rw-r--r-- | app/controllers/users_controller.rb | 4 | ||||
-rw-r--r-- | app/helpers/mailer_helper.rb | 2 | ||||
-rw-r--r-- | db/migrate/02_create_users.rb | 2 | ||||
-rw-r--r-- | db/migrate/03_create_blogposts.rb | 2 | ||||
-rw-r--r-- | db/migrate/04_create_comments.rb | 2 | ||||
-rw-r--r-- | db/migrate/07_create_forumthreads.rb | 2 | ||||
-rw-r--r-- | db/migrate/08_create_sessions.rb | 2 | ||||
-rw-r--r-- | db/migrate/10_create_threadreplies.rb | 2 | ||||
-rw-r--r-- | db/schema.rb | 156 |
11 files changed, 253 insertions, 207 deletions
@@ -1,10 +1,10 @@ source 'https://rubygems.org' -gem 'rails', '4.1.0' +gem 'rails', github: 'rails/rails', branch: '4-2-stable' gem 'mysql2' gem 'jquery-rails' -gem 'bcrypt-ruby' # To use ActiveModel's has_secure_password +gem 'bcrypt' # To use ActiveModel's has_secure_password gem 'sanitize' gem 'strip_attributes' gem 'redcarpet', '~> 3.2.3' @@ -20,7 +20,6 @@ gem 'jquery-textcomplete-rails', github: 'RedstonerServer/jquery-textcomplete-ra # in production environments by default. group :assets do gem 'sass-rails' - gem 'coffee-rails' gem 'uglifier' end @@ -33,7 +32,15 @@ group :development do gem 'capistrano-rails', '~> 1.1.2' gem 'capistrano-rbenv', '~> 2.0' gem 'capistrano-bundler', '~> 1.1.3' + # windows timezone foo + gem 'tzinfo-data', platforms: [:mingw, :mswin] end -# Use unicorn as the app server -gem 'unicorn'
\ No newline at end of file +group :test do + gem 'sqlite3' +end + +group :production do + # Use unicorn as the app server + gem 'unicorn' +end
\ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 705d8af..8e09425 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -23,46 +23,76 @@ GIT actionpack (>= 3.0.0) activesupport (>= 3.0.0) -GEM - remote: https://rubygems.org/ +GIT + remote: git://github.com/rails/rails.git + revision: dd750a33c854bcd9eefe7ea46b0b0bb52c06767f + branch: 4-2-stable specs: - actionmailer (4.1.0) - actionpack (= 4.1.0) - actionview (= 4.1.0) - mail (~> 2.5.4) - actionpack (4.1.0) - actionview (= 4.1.0) - activesupport (= 4.1.0) - rack (~> 1.5.2) + actionmailer (4.2.5) + actionpack (= 4.2.5) + actionview (= 4.2.5) + activejob (= 4.2.5) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.5) + actionview (= 4.2.5) + activesupport (= 4.2.5) + rack (~> 1.6) rack-test (~> 0.6.2) - actionview (4.1.0) - activesupport (= 4.1.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.5) + activesupport (= 4.2.5) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.0) - activesupport (= 4.1.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.5) + activesupport (= 4.2.5) + globalid (>= 0.3.0) + activemodel (4.2.5) + activesupport (= 4.2.5) builder (~> 3.1) - activerecord (4.1.0) - activemodel (= 4.1.0) - activesupport (= 4.1.0) - arel (~> 5.0.0) - activerecord-session_store (0.1.0) - actionpack (>= 4.0.0, < 5) - activerecord (>= 4.0.0, < 5) - railties (>= 4.0.0, < 5) - activesupport (4.1.0) - i18n (~> 0.6, >= 0.6.9) + activerecord (4.2.5) + activemodel (= 4.2.5) + activesupport (= 4.2.5) + arel (~> 6.0) + activesupport (4.2.5) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (5.0.0) - bcrypt (3.1.7) - bcrypt-ruby (3.1.5) - bcrypt (>= 3.1.3) - better_errors (1.1.0) + rails (4.2.5) + actionmailer (= 4.2.5) + actionpack (= 4.2.5) + actionview (= 4.2.5) + activejob (= 4.2.5) + activemodel (= 4.2.5) + activerecord (= 4.2.5) + activesupport (= 4.2.5) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.5) + sprockets-rails + railties (4.2.5) + actionpack (= 4.2.5) + activesupport (= 4.2.5) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + +GEM + remote: https://rubygems.org/ + specs: + activerecord-session_store (0.1.2) + actionpack (>= 4.0.0, < 5) + activerecord (>= 4.0.0, < 5) + railties (>= 4.0.0, < 5) + arel (6.0.3) + bcrypt (3.1.10) + better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) + rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) @@ -73,112 +103,117 @@ GEM capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.1.2) + capistrano-rails (1.1.5) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rbenv (2.0.3) + capistrano-rbenv (2.0.4) capistrano (~> 3.1) sshkit (~> 1.3) - choice (0.1.6) + choice (0.2.0) coderay (1.1.0) - coffee-rails (4.0.1) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.7.0) - colorize (0.7.5) + coffee-script-source (1.10.0) + concurrent-ruby (1.0.0) + crass (1.0.2) debug_inspector (0.0.2) + domain_name (0.5.25) + unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - execjs (2.0.2) - hike (1.2.3) - hirb (0.7.1) - i18n (0.6.9) - jquery-rails (3.1.0) - railties (>= 3.0, < 5.0) + execjs (2.6.0) + globalid (0.3.6) + activesupport (>= 4.1.0) + hirb (0.7.3) + http-cookie (1.0.2) + domain_name (~> 0.5) + i18n (0.7.0) + jquery-rails (4.1.0) + rails-dom-testing (~> 1.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.1) - kgio (2.9.2) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.25.1) - mini_portile (0.5.3) - minitest (5.3.2) - multi_json (1.9.2) - mysql2 (0.3.15) + json (1.8.3) + kgio (2.10.0) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.3) + mime-types (>= 1.16, < 3) + mime-types (2.99) + mini_portile2 (2.0.0) + minitest (5.8.3) + mysql2 (0.4.2) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - polyglot (0.3.4) - rack (1.5.2) - rack-test (0.6.2) + net-ssh (3.0.2) + netrc (0.11.0) + nokogiri (1.6.7.1) + mini_portile2 (~> 2.0.0.rc2) + nokogumbo (1.4.7) + nokogiri + rack (1.6.4) + rack-test (0.6.3) rack (>= 1.0) - rails (4.1.0) - actionmailer (= 4.1.0) - actionpack (= 4.1.0) - actionview (= 4.1.0) - activemodel (= 4.1.0) - activerecord (= 4.1.0) - activesupport (= 4.1.0) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.0) - sprockets-rails (~> 2.0) - rails-erd (1.1.0) - activerecord (>= 3.0) - activesupport (>= 3.0) - choice (~> 0.1.6) - ruby-graphviz (~> 1.0.4) - railties (4.1.0) - actionpack (= 4.1.0) - activesupport (= 4.1.0) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - raindrops (0.13.0) - rake (10.2.2) - rb-readline (0.5.1) + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-erd (1.4.5) + activerecord (>= 3.2) + activesupport (>= 3.2) + choice (~> 0.2.0) + ruby-graphviz (~> 1.2) + rails-html-sanitizer (1.0.2) + loofah (~> 2.0) + raindrops (0.15.0) + rake (10.5.0) + rb-readline (0.5.3) redcarpet (3.2.3) - rest-client (1.6.7) - mime-types (>= 1.16) - ruby-graphviz (1.0.9) - sanitize (2.1.0) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + ruby-graphviz (1.2.2) + sanitize (4.0.1) + crass (~> 1.0.2) nokogiri (>= 1.4.4) - sass (3.2.19) - sass-rails (4.0.3) + nokogumbo (~> 1.4.1) + sass (3.4.21) + sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.0) - sprockets (~> 2.8, <= 2.11.0) - sprockets-rails (~> 2.0) - sprockets (2.11.0) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (~> 2.8) - sshkit (1.7.1) - colorize (>= 0.7.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.0.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.11) + sshkit (1.8.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - strip_attributes (1.5.1) + strip_attributes (1.7.1) activemodel (>= 3.0, < 5.0) thor (0.19.1) - thread_safe (0.3.3) - tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (1.1.0) + thread_safe (0.3.5) + tilt (2.0.2) + tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.0) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - unicorn (4.8.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) + unicorn (5.0.1) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -189,27 +224,31 @@ PLATFORMS DEPENDENCIES activerecord-session_store - bcrypt-ruby + bcrypt better_errors binding_of_caller capistrano-bundler (~> 1.1.3) capistrano-rails (~> 1.1.2) capistrano-rbenv (~> 2.0) - coffee-rails highlight_js-rails! hirb jquery-rails jquery-textcomplete-rails! kaminari! mysql2 - rails (= 4.1.0) + rails! rails-erd rb-readline redcarpet (~> 3.2.3) rest-client sanitize sass-rails + sqlite3 strip_attributes + tzinfo-data uglifier unicorn webrick + +BUNDLED WITH + 1.11.2 diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 730f981..caa5f02 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -108,8 +108,8 @@ class UsersController < ApplicationController end begin # these shouldn't be send in the background - RedstonerMailer.register_mail(@user, is_idiot).deliver - RedstonerMailer.register_info_mail(@user, is_idiot).deliver + RedstonerMailer.register_mail(@user, is_idiot).deliver_now + RedstonerMailer.register_info_mail(@user, is_idiot).deliver_now rescue => e Rails.logger.error "---" Rails.logger.error "WARNING: registration mail failed for user #{@user.try(:name)}, #{@user.try(:email)}" diff --git a/app/helpers/mailer_helper.rb b/app/helpers/mailer_helper.rb index 7ddc853..dbacf81 100644 --- a/app/helpers/mailer_helper.rb +++ b/app/helpers/mailer_helper.rb @@ -4,7 +4,7 @@ module MailerHelper begin mails.each do |mail| begin - mail.deliver + mail.deliver_now rescue => e Rails.logger.error "---" Rails.logger.error "WARNING: '#{mail.try(:subject)}' failed for recipient #{mail.try(:to)}" diff --git a/db/migrate/02_create_users.rb b/db/migrate/02_create_users.rb index c8d68ed..1fefaf9 100644 --- a/db/migrate/02_create_users.rb +++ b/db/migrate/02_create_users.rb @@ -20,7 +20,7 @@ class CreateUsers < ActiveRecord::Migration t.references :role, null: false, default: Role.get(:normal) - t.timestamps + t.timestamps null: true end end end
\ No newline at end of file diff --git a/db/migrate/03_create_blogposts.rb b/db/migrate/03_create_blogposts.rb index fd674bb..f530ed1 100644 --- a/db/migrate/03_create_blogposts.rb +++ b/db/migrate/03_create_blogposts.rb @@ -7,7 +7,7 @@ class CreateBlogposts < ActiveRecord::Migration t.references :user_author t.references :user_editor - t.timestamps + t.timestamps null: true end end end
\ No newline at end of file diff --git a/db/migrate/04_create_comments.rb b/db/migrate/04_create_comments.rb index 61b6871..022bae6 100644 --- a/db/migrate/04_create_comments.rb +++ b/db/migrate/04_create_comments.rb @@ -7,7 +7,7 @@ class CreateComments < ActiveRecord::Migration t.references :user_editor t.references :blogpost - t.timestamps + t.timestamps null: true end end end diff --git a/db/migrate/07_create_forumthreads.rb b/db/migrate/07_create_forumthreads.rb index 1f06761..830b5f2 100644 --- a/db/migrate/07_create_forumthreads.rb +++ b/db/migrate/07_create_forumthreads.rb @@ -11,7 +11,7 @@ class CreateForumthreads < ActiveRecord::Migration t.references :forum - t.timestamps + t.timestamps null: true end end end diff --git a/db/migrate/08_create_sessions.rb b/db/migrate/08_create_sessions.rb index b2443e4..8e12ed1 100644 --- a/db/migrate/08_create_sessions.rb +++ b/db/migrate/08_create_sessions.rb @@ -3,7 +3,7 @@ class CreateSessions < ActiveRecord::Migration create_table :sessions do |t| t.string :session_id, :null => false t.text :data - t.timestamps + t.timestamps null: true end add_index :sessions, :session_id diff --git a/db/migrate/10_create_threadreplies.rb b/db/migrate/10_create_threadreplies.rb index 97a6626..ff6a810 100644 --- a/db/migrate/10_create_threadreplies.rb +++ b/db/migrate/10_create_threadreplies.rb @@ -7,7 +7,7 @@ class CreateThreadreplies < ActiveRecord::Migration t.references :user_editor t.references :forumthread - t.timestamps + t.timestamps null: true end end end diff --git a/db/schema.rb b/db/schema.rb index 0f9ed93..586de61 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,89 +11,89 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150826002927) do +ActiveRecord::Schema.define(version: 20150825232749) do - create_table "blogposts", force: true do |t| - t.string "title" - t.text "content" - t.integer "user_author_id" - t.integer "user_editor_id" + create_table "blogposts", force: :cascade do |t| + t.string "title", limit: 255 + t.text "content", limit: 65535 + t.integer "user_author_id", limit: 4 + t.integer "user_editor_id", limit: 4 t.datetime "created_at" t.datetime "updated_at" end - create_table "comments", force: true do |t| - t.text "content" - t.integer "user_author_id" - t.integer "user_editor_id" - t.integer "blogpost_id" + create_table "comments", force: :cascade do |t| + t.text "content", limit: 65535 + t.integer "user_author_id", limit: 4 + t.integer "user_editor_id", limit: 4 + t.integer "blogpost_id", limit: 4 t.datetime "created_at" t.datetime "updated_at" end - create_table "forumgroups", force: true do |t| - t.string "name" - t.integer "position" - t.integer "role_read_id" - t.integer "role_write_id" + create_table "forumgroups", force: :cascade do |t| + t.string "name", limit: 255 + t.integer "position", limit: 4 + t.integer "role_read_id", limit: 4 + t.integer "role_write_id", limit: 4 end - create_table "forums", force: true do |t| - t.string "name" - t.integer "position" - t.integer "role_read_id" - t.integer "role_write_id" - t.integer "forumgroup_id" + create_table "forums", force: :cascade do |t| + t.string "name", limit: 255 + t.integer "position", limit: 4 + t.integer "role_read_id", limit: 4 + t.integer "role_write_id", limit: 4 + t.integer "forumgroup_id", limit: 4 end - create_table "forums_labels", id: false, force: true do |t| - t.integer "forum_id" - t.integer "label_id" + create_table "forums_labels", id: false, force: :cascade do |t| + t.integer "forum_id", limit: 4 + t.integer "label_id", limit: 4 end - create_table "forumthreads", force: true do |t| - t.string "title" - t.text "content" - t.boolean "sticky", default: false - t.boolean "locked", default: false - t.integer "user_author_id" - t.integer "user_editor_id" - t.integer "forum_id" + create_table "forumthreads", force: :cascade do |t| + t.string "title", limit: 255 + t.text "content", limit: 65535 + t.boolean "sticky", default: false + t.boolean "locked", default: false + t.integer "user_author_id", limit: 4 + t.integer "user_editor_id", limit: 4 + t.integer "forum_id", limit: 4 t.datetime "created_at" t.datetime "updated_at" - t.integer "label_id" + t.integer "label_id", limit: 4 end - create_table "info", force: true do |t| - t.string "title" - t.text "content" + create_table "info", force: :cascade do |t| + t.string "title", limit: 255 + t.text "content", limit: 65535 t.datetime "created_at" t.datetime "updated_at" end - create_table "labels", force: true do |t| - t.string "name" - t.string "color" + create_table "labels", force: :cascade do |t| + t.string "name", limit: 255 + t.string "color", limit: 255 end - create_table "register_tokens", force: true do |t| - t.string "uuid", limit: 32, null: false - t.string "token", limit: 6, null: false - t.string "email", null: false + create_table "register_tokens", force: :cascade do |t| + t.string "uuid", limit: 32, null: false + t.string "token", limit: 6, null: false + t.string "email", limit: 255, null: false end add_index "register_tokens", ["email"], name: "index_register_tokens_on_email", unique: true, using: :btree add_index "register_tokens", ["uuid"], name: "index_register_tokens_on_uuid", unique: true, using: :btree - create_table "roles", force: true do |t| - t.string "name" - t.integer "value" - t.string "color" + create_table "roles", force: :cascade do |t| + t.string "name", limit: 255 + t.integer "value", limit: 4 + t.string "color", limit: 255 end - create_table "sessions", force: true do |t| - t.string "session_id", null: false - t.text "data" + create_table "sessions", force: :cascade do |t| + t.string "session_id", limit: 255, null: false + t.text "data", limit: 65535 t.datetime "created_at" t.datetime "updated_at" end @@ -101,40 +101,40 @@ ActiveRecord::Schema.define(version: 20150826002927) do add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree - create_table "threadreplies", force: true do |t| - t.text "content" - t.integer "user_author_id" - t.integer "user_editor_id" - t.integer "forumthread_id" + create_table "threadreplies", force: :cascade do |t| + t.text "content", limit: 65535 + t.integer "user_author_id", limit: 4 + t.integer "user_editor_id", limit: 4 + t.integer "forumthread_id", limit: 4 t.datetime "created_at" t.datetime "updated_at" end - create_table "users", force: true do |t| - t.string "uuid", null: false - t.string "name", null: false - t.string "password_digest", null: false - t.string "ign", null: false - t.string "email", null: false - t.text "about" - t.string "last_ip" - t.string "skype" - t.boolean "skype_public", default: false - t.string "youtube" - t.string "youtube_channelname" - t.string "twitter" - t.boolean "donor", default: false - t.string "email_token" - t.boolean "confirmed", default: false + create_table "users", force: :cascade do |t| + t.string "uuid", limit: 255, null: false + t.string "name", limit: 255, null: false + t.string "password_digest", limit: 255, null: false + t.string "ign", limit: 255, null: false + t.string "email", limit: 255, null: false + t.text "about", limit: 65535 + t.string "last_ip", limit: 255 + t.string "skype", limit: 255 + t.boolean "skype_public", default: false + t.string "youtube", limit: 255 + t.string "youtube_channelname", limit: 255 + t.string "twitter", limit: 255 + t.boolean "donor", default: false + t.string "email_token", limit: 255 + t.boolean "confirmed", default: false t.datetime "last_seen" - t.integer "role_id", null: false + t.integer "role_id", limit: 4, null: false t.datetime "created_at" t.datetime "updated_at" - t.boolean "mail_own_thread_reply", default: true - t.boolean "mail_other_thread_reply", default: true - t.boolean "mail_own_blogpost_comment", default: true - t.boolean "mail_other_blogpost_comment", default: true - t.boolean "mail_mention", default: true + t.boolean "mail_own_thread_reply", default: true + t.boolean "mail_other_thread_reply", default: true + t.boolean "mail_own_blogpost_comment", default: true + t.boolean "mail_other_blogpost_comment", default: true + t.boolean "mail_mention", default: true end add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree |