From d1a9428c8e50bb6725f1675d14c071e5add9ebc2 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Thu, 26 Jun 2014 10:54:09 +0200 Subject: [PATCH] update gems --- Gemfile.lock | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++ db/schema.rb | 42 ++++----- 2 files changed, 279 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e69de29b..74a1244d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -0,0 +1,258 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.2.9) + aasm (3.2.1) + actionmailer (4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + mail (~> 2.5.4) + actionpack (4.1.1) + actionview (= 4.1.1) + activesupport (= 4.1.1) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionpack-xml_parser (1.0.1) + actionpack (>= 4.0.0.rc1) + actionview (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + activerecord (4.1.1) + activemodel (= 4.1.1) + activesupport (= 4.1.1) + arel (~> 5.0.0) + activesupport (4.1.1) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) + acts_as_list (0.4.0) + activerecord (>= 3.0) + arel (5.0.1.20140414130214) + aruba (0.5.4) + childprocess (>= 0.3.6) + cucumber (>= 1.1.1) + rspec-expectations (>= 2.7.0) + bcrypt (3.1.7) + bootstrap-sass (3.1.1.1) + sass (~> 3.2) + builder (3.2.2) + bullet (4.11.1) + activesupport (>= 3.0.0) + uniform_notifier (>= 1.6.0) + cache_digests (0.3.1) + actionpack (>= 3.2) + thread_safe + capybara (2.3.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.5.3) + ffi (~> 1.0, >= 1.0.11) + codeclimate-test-reporter (0.3.0) + simplecov (>= 0.7.1, < 1.0.0) + coffee-rails (4.0.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.7.0) + crass (0.2.0) + cucumber (1.3.15) + builder (>= 2.1.2) + diff-lcs (>= 1.1.3) + gherkin (~> 2.12) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.1) + cucumber-rails (1.4.1) + capybara (>= 1.1.2, < 3) + cucumber (>= 1.3.8, < 2) + mime-types (~> 1.16) + nokogiri (~> 1.5) + rails (>= 3, < 5) + database_cleaner (1.3.0) + diff-lcs (1.2.5) + docile (1.1.5) + erubis (2.7.0) + execjs (2.2.0) + factory_girl (4.4.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.4.1) + factory_girl (~> 4.4.0) + railties (>= 3.0.0) + ffi (1.9.3) + font-awesome-sass (4.1.0) + sass (~> 3.2) + gherkin (2.12.2) + multi_json (~> 1.3) + hike (1.2.3) + htmlentities (4.3.2) + i18n (0.6.9) + jquery-rails (3.1.1) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.1) + libv8 (3.16.14.3) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + metaclass (0.0.4) + mime-types (1.25.1) + mini_portile (0.6.0) + minitest (5.3.5) + mocha (1.1.0) + metaclass (~> 0.0.1) + mousetrap-rails (1.4.6) + multi_json (1.10.1) + multi_test (0.1.1) + mysql2 (0.3.16) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) + nokogumbo (1.1.9) + nokogiri + polyglot (0.3.5) + rack (1.5.2) + rack-mini-profiler (0.9.2) + rack (>= 1.1.3) + rack-test (0.6.2) + rack (>= 1.0) + rails (4.1.1) + actionmailer (= 4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + activemodel (= 4.1.1) + activerecord (= 4.1.1) + activesupport (= 4.1.1) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.1) + sprockets-rails (~> 2.0) + rails_autolink (1.1.6) + rails (> 3.1) + railties (4.1.1) + actionpack (= 4.1.1) + activesupport (= 4.1.1) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (10.3.2) + ref (1.0.5) + rspec-expectations (3.0.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.0.0) + rspec-support (3.0.2) + rubyzip (1.1.4) + safe_yaml (1.0.3) + sanitize (3.0.0) + crass (~> 0.2.0) + nokogiri (>= 1.4.4) + nokogumbo (= 1.1.9) + sass (3.2.19) + sass-rails (4.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) + selenium-webdriver (2.42.0) + childprocess (>= 0.5.0) + multi_json (~> 1.0) + rubyzip (~> 1.0) + websocket (~> 1.0.4) + simplecov (0.8.2) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + spring (1.1.3) + spring-commands-cucumber (1.0.1) + spring (>= 0.9.1) + 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) + sqlite3 (1.3.9) + swf_fu (2.0.4) + coffee-script + rails (>= 3.1) + therubyracer (0.12.1) + libv8 (~> 3.16.14.0) + ref + thor (0.19.1) + thread_safe (0.3.4) + tilt (1.4.1) + tolk (1.5.1) + safe_yaml (>= 0.8) + will_paginate + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + turbolinks (2.2.2) + coffee-rails + tzinfo (1.2.1) + thread_safe (~> 0.1) + uglifier (2.5.1) + execjs (>= 0.3.0) + json (>= 1.8.0) + uniform_notifier (1.6.2) + websocket (1.0.7) + will_paginate (3.0.5) + will_paginate-bootstrap (1.0.0) + will_paginate (>= 3.0.3) + xpath (2.0.0) + nokogiri (~> 1.3) + yard (0.8.7.4) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth + aasm + actionpack-xml_parser (>= 1.0.1) + acts_as_list + aruba (>= 0.5.4) + bcrypt (~> 3.1.7) + bootstrap-sass + bullet + cache_digests + capybara + codeclimate-test-reporter + coffee-rails (~> 4.0) + cucumber-rails + database_cleaner + factory_girl_rails + font-awesome-sass + htmlentities + jquery-rails + mocha + mousetrap-rails + mysql2 + rack-mini-profiler + rails (~> 4.1.0) + rails_autolink + rspec-expectations + sanitize + sass-rails (~> 4.0) + selenium-webdriver + simplecov + spring + spring-commands-cucumber + sqlite3 + swf_fu + therubyracer + tolk (>= 1.5.0) + turbolinks + uglifier (>= 1.3.0) + will_paginate-bootstrap + yard diff --git a/db/schema.rb b/db/schema.rb index 96516f59..063744e8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -15,7 +15,7 @@ ActiveRecord::Schema.define(version: 20130227205845) do create_table "contexts", force: true do |t| t.string "name", null: false - t.integer "position" + t.integer "position", default: 0 t.integer "user_id", default: 1 t.datetime "created_at" t.datetime "updated_at" @@ -85,11 +85,11 @@ ActiveRecord::Schema.define(version: 20130227205845) do add_index "preferences", ["user_id"], name: "index_preferences_on_user_id", using: :btree create_table "projects", force: true do |t| - t.string "name", null: false - t.integer "position" - t.integer "user_id", default: 1 - t.text "description" - t.string "state", limit: 20, null: false + t.string "name", null: false + t.integer "position", default: 0 + t.integer "user_id", default: 1 + t.text "description", limit: 16777215 + t.string "state", limit: 20, null: false t.datetime "created_at" t.datetime "updated_at" t.integer "default_context_id" @@ -104,17 +104,17 @@ ActiveRecord::Schema.define(version: 20130227205845) do add_index "projects", ["user_id"], name: "index_projects_on_user_id", using: :btree create_table "recurring_todos", force: true do |t| - t.integer "user_id", default: 1 - t.integer "context_id", null: false + t.integer "user_id", default: 1 + t.integer "context_id", null: false t.integer "project_id" - t.string "description", null: false - t.text "notes" - t.string "state", limit: 20, null: false + t.string "description", null: false + t.text "notes", limit: 16777215 + t.string "state", limit: 20, null: false t.datetime "start_from" t.string "ends_on" t.datetime "end_date" t.integer "number_of_occurences" - t.integer "occurences_count", default: 0 + t.integer "occurences_count", default: 0 t.string "target" t.integer "show_from_delta" t.string "recurring_period" @@ -123,7 +123,7 @@ ActiveRecord::Schema.define(version: 20130227205845) do t.integer "every_other2" t.integer "every_other3" t.string "every_day" - t.boolean "only_work_days", default: false + t.boolean "only_work_days", default: false t.integer "every_count" t.integer "weekday" t.datetime "completed_at" @@ -141,7 +141,7 @@ ActiveRecord::Schema.define(version: 20130227205845) do t.datetime "updated_at" end - add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree + add_index "sessions", ["session_id"], name: "sessions_session_id_index", using: :btree create_table "taggings", force: true do |t| t.integer "taggable_id" @@ -162,19 +162,19 @@ ActiveRecord::Schema.define(version: 20130227205845) do add_index "tags", ["name"], name: "index_tags_on_name", using: :btree create_table "todos", force: true do |t| - t.integer "context_id", null: false + t.integer "context_id", null: false t.integer "project_id" - t.string "description", null: false - t.text "notes" + t.string "description", null: false + t.text "notes", limit: 16777215 t.datetime "created_at" t.datetime "due" t.datetime "completed_at" - t.integer "user_id", default: 1 + t.integer "user_id", default: 1 t.datetime "show_from" - t.string "state", limit: 20, null: false + t.string "state", limit: 20, null: false t.integer "recurring_todo_id" t.datetime "updated_at" - t.text "rendered_notes" + t.text "rendered_notes", limit: 16777215 end add_index "todos", ["context_id"], name: "index_todos_on_context_id", using: :btree @@ -212,7 +212,7 @@ ActiveRecord::Schema.define(version: 20130227205845) do create_table "users", force: true do |t| t.string "login", limit: 80, null: false - t.string "crypted_password", limit: 60, null: false + t.string "crypted_password", limit: 60 t.string "token" t.boolean "is_admin", default: false, null: false t.string "first_name"