contour 2.4.0.beta3 → 2.4.0.rc

data/app/assets/stylesheets/contour.css

@@ -3,7 +3,7 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require bootstrap/v3.1.0/bootstrap
+ *= require bootstrap/v3.1.1/bootstrap
  *= require bootstrap/bs-callout
  *= require glyphicons-overrides
  *= require bootstrap-overrides

data/contour.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |s|
   s.files = Dir['{app,config,db,lib}/**/*'] + ['CHANGELOG.md', 'contour.gemspec', 'LICENSE', 'Rakefile', 'README.md']
   s.test_files = Dir['test/**/*'] - Dir['test/dummy/{tmp,log}/**/*']
 
-  s.add_dependency 'rails',                   '~> 4.0.2'
+  s.add_dependency 'rails',                   '~> 4.0.3'
   s.add_dependency 'jquery-rails',            '>= 3.0.4'
   s.add_dependency 'coffee-rails',            '~> 4.0.1'
-  s.add_dependency 'devise',                  '~> 3.2.2'
+  s.add_dependency 'devise',                  '~> 3.2.3'
   s.add_dependency 'omniauth',                '~> 1.2.1'
   # s.add_dependency 'omniauth-cas',            '~> 1.0.4'
   # s.add_dependency 'omniauth-facebook',       '~> 1.6.0'

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 4
     TINY = 0
-    BUILD = "beta3" # nil, "pre", "rc", "rc2"
+    BUILD = "rc" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/lib/generators/contour/scaffold/templates/_paginate.html.erb

@@ -1,4 +1,4 @@
-<%%= render partial: 'contour/layouts/per_page', locals: { per_page: 20, object_count: @<%= resource_name_plural %>.total_count } %>
+<%%= render partial: 'contour/layouts/per_page', locals: { per_page: 40, object_count: @<%= resource_name_plural %>.total_count } %>
 
 <table class="table table-striped">
   <thead>

data/lib/generators/contour/scaffold/templates/controller.rb

@@ -6,7 +6,7 @@ class <%= resource_class_name_plural %>Controller < ApplicationController
   # GET /<%= resource_name_plural %>.json
   def index
     @order = scrub_order(<%= resource_class_name %>, params[:order], "<%= resource_name_plural %>.name")
-    @<%= resource_name_plural %> = <%= resource_class_name %>.current.order(@order).page(params[:page]).per( 20 )
+    @<%= resource_name_plural %> = <%= resource_class_name %>.current.order(@order).page(params[:page]).per( 40 )
   end
 
   # GET /<%= resource_name_plural %>/1

data/test/dummy/db/schema.rb

@@ -9,38 +9,38 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111203203307) do
+ActiveRecord::Schema.define(version: 20111203203307) do
 
-  create_table "authentications", :force => true do |t|
+  create_table "authentications", force: true do |t|
     t.integer  "user_id"
     t.string   "provider"
     t.string   "uid"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "users", :force => true do |t|
+  create_table "users", force: true do |t|
     t.string   "first_name"
     t.string   "last_name"
-    t.string   "status",                 :default => "pending", :null => false
-    t.boolean  "deleted",                :default => false,     :null => false
-    t.string   "email",                  :default => "",        :null => false
-    t.string   "encrypted_password",     :default => "",        :null => false
+    t.string   "status",                 default: "pending", null: false
+    t.boolean  "deleted",                default: false,     null: false
+    t.string   "email",                  default: "",        null: false
+    t.string   "encrypted_password",     default: "",        null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          :default => 0
+    t.integer  "sign_in_count",          default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at",                                    :null => false
-    t.datetime "updated_at",                                    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
-  add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+  add_index "users", ["email"], name: "index_users_on_email", unique: true
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.4.0.beta3
+  version: 2.4.0.rc
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ files:
 - app/assets/images/contour/ui-icons_cd0a0a_256x240.png
 - app/assets/images/contour/ui-icons_d8e7f3_256x240.png
 - app/assets/images/contour/ui-icons_f9bd01_256x240.png
-- app/assets/javascripts/bootstrap/v3.1.0/bootstrap.js
+- app/assets/javascripts/bootstrap/v3.1.1/bootstrap.js
 - app/assets/javascripts/contour.js
 - app/assets/javascripts/contour/global.js.coffee
 - app/assets/javascripts/external/bootstrap-datepicker.js
@@ -175,7 +175,7 @@ files:
 - app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
 - app/assets/stylesheets/bootstrap-overrides.css
 - app/assets/stylesheets/bootstrap/bs-callout.css
-- app/assets/stylesheets/bootstrap/v3.1.0/bootstrap.css
+- app/assets/stylesheets/bootstrap/v3.1.1/bootstrap.css
 - app/assets/stylesheets/contour.css
 - app/assets/stylesheets/contour/about.css
 - app/assets/stylesheets/datepicker.css
@@ -292,6 +292,7 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20111203203123_devise_create_users.rb
 - test/dummy/db/migrate/20111203203307_create_authentications.rb
 - test/dummy/db/schema.rb
@@ -328,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Basic Rails framework files and assets for layout and authentication
@@ -368,6 +369,7 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
+- test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20111203203123_devise_create_users.rb
 - test/dummy/db/migrate/20111203203307_create_authentications.rb
 - test/dummy/db/schema.rb