diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | db/schema.rb | 30 |
4 files changed, 15 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml index 7ca1a3e9d..0362f9def 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,3 @@ before_script: - "rake db:create" - "rake apartment:migrate" script: "rake spec" -branches: - only: - - master - - production
\ No newline at end of file @@ -53,7 +53,7 @@ gem 'apartment',:git => 'git://github.com/dryade/apartment.git' gem 'coffee-rails', '~> 3.2.1' gem 'coffee-script-source' gem 'therubyrhino', :platform => :jruby -gem 'therubyracer', :platform => :ruby +gem 'therubyracer', '~> 0.10.2', :platform => :ruby gem 'rabl' @@ -77,7 +77,8 @@ group :test, :development do gem "remarkable", "~> 4.0.0.alpha4" gem "remarkable_activerecord", "~> 4.0.0.alpha4" gem "shoulda-matchers" - gem 'rb-inotify', :platform => :ruby + gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify' + gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 32b01c903..69104af69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -391,6 +391,7 @@ DEPENDENCIES rabl rails (= 3.2.6) ransack + rb-fsevent rb-inotify remarkable (~> 4.0.0.alpha4) remarkable_activerecord (~> 4.0.0.alpha4) @@ -400,7 +401,7 @@ DEPENDENCIES shoulda-matchers sqlite3 squeel - therubyracer + therubyracer (~> 0.10.2) therubyrhino uglifier (>= 1.0.3) user_interface! diff --git a/db/schema.rb b/db/schema.rb index cbbd696ab..17430230a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20121025112852) do +ActiveRecord::Schema.define(:version => 20121211085620) do create_table "access_links", :force => true do |t| t.integer "access_point_id", :limit => 8 @@ -63,6 +63,15 @@ ActiveRecord::Schema.define(:version => 20121025112852) do add_index "access_points", ["objectid"], :name => "access_points_objectid_key", :unique => true + create_table "api_keys", :id => false, :force => true do |t| + t.integer "id", :limit => 8 + t.integer "referential_id" + t.string "token" + t.string "name" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "companies", :force => true do |t| t.string "objectid", :null => false t.integer "object_version" @@ -199,16 +208,6 @@ ActiveRecord::Schema.define(:version => 20121025112852) do t.integer "organisation_id" end - create_table "geometry_columns", :id => false, :force => true do |t| - t.string "f_table_catalog", :limit => 256, :null => false - t.string "f_table_schema", :limit => 256, :null => false - t.string "f_table_name", :limit => 256, :null => false - t.string "f_geometry_column", :limit => 256, :null => false - t.integer "coord_dimension", :null => false - t.integer "srid", :null => false - t.string "type", :limit => 30, :null => false - end - create_table "group_of_lines", :force => true do |t| t.string "objectid", :null => false t.integer "object_version" @@ -339,7 +338,6 @@ ActiveRecord::Schema.define(:version => 20121025112852) do t.string "prefix" t.string "projection_type" t.string "time_zone" - t.string "the_geom" t.string "bounds" t.integer "organisation_id" end @@ -366,14 +364,6 @@ ActiveRecord::Schema.define(:version => 20121025112852) do t.integer "line_id", :limit => 8 end - create_table "spatial_ref_sys", :id => false, :force => true do |t| - t.integer "srid", :null => false - t.string "auth_name", :limit => 256 - t.integer "auth_srid" - t.string "srtext", :limit => 2048 - t.string "proj4text", :limit => 2048 - end - create_table "stop_areas", :force => true do |t| t.integer "parent_id", :limit => 8 t.string "objectid", :null => false |