From 5aae2e937a2fe757ff124be3094eccd4c10a92f4 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 4 Sep 2014 17:11:42 +1000
Subject: [PATCH] minor hacking to get rails master to work

(note broken cause type mapping changed but close to working)

commented gemfile a bit
---
 Gemfile             |  13 +-
 Gemfile.lock        |   2 +-
 Gemfile_master.lock | 537 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 549 insertions(+), 3 deletions(-)
 create mode 100644 Gemfile_master.lock

diff --git a/Gemfile b/Gemfile
index 2acc438c943..40ac4e481aa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,10 @@ gem 'mail', '~> 2.5.4'
 gem 'hiredis'
 gem 'redis', require:  ["redis", "redis/connection/hiredis"]
 
-gem 'active_model_serializers'
+# We use some ams 0.8.0 features, need to amend code
+# to support 0.9 etc, bench needs to run and ensure no
+# perf regressions
+gem 'active_model_serializers', '~> 0.8.0'
 
 
 gem 'onebox'
@@ -161,7 +164,13 @@ gem 'rack-protection' # security
 # in production environments by default.
 # allow everywhere for now cause we are allowing asset debugging in prd
 group :assets do
-  gem 'sass-rails', '~> 4.0.2'
+
+  if rails_master?
+    gem 'sass-rails', git: 'https://github.com/rails/sass-rails.git'
+  else
+    gem 'sass-rails', '~> 4.0.2'
+  end
+
   gem 'uglifier'
   gem 'rtlit', require: false # for css rtling
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c43b7e85f01..54c0c02a1a1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -406,7 +406,7 @@ PLATFORMS
 
 DEPENDENCIES
   actionpack-action_caching
-  active_model_serializers
+  active_model_serializers (~> 0.8.0)
   airbrake (= 3.1.2)
   annotate
   barber
diff --git a/Gemfile_master.lock b/Gemfile_master.lock
new file mode 100644
index 00000000000..16e366b7caf
--- /dev/null
+++ b/Gemfile_master.lock
@@ -0,0 +1,537 @@
+GIT
+  remote: https://github.com/rails/actionpack-action_caching.git
+  revision: a9f3f09477b12b51faa6756005eee4103f7f4030
+  specs:
+    actionpack-action_caching (1.1.0)
+      actionpack (>= 4.0.0, < 5.0)
+
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: 316962d0922992fbe756521bd7c94a751aa1253e
+  specs:
+    actionmailer (4.2.0.beta1)
+      actionpack (= 4.2.0.beta1)
+      actionview (= 4.2.0.beta1)
+      activejob (= 4.2.0.beta1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.2)
+    actionpack (4.2.0.beta1)
+      actionview (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      rack (~> 1.6.0.beta)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0)
+    actionview (4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0)
+    activejob (4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      globalid (>= 0.2.3)
+    activemodel (4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      builder (~> 3.1)
+    activerecord (4.2.0.beta1)
+      activemodel (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      arel (>= 6.0.0.beta1, < 6.1)
+    activesupport (4.2.0.beta1)
+      i18n (>= 0.7.0.beta1, < 0.8)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    rails (4.2.0.beta1)
+      actionmailer (= 4.2.0.beta1)
+      actionpack (= 4.2.0.beta1)
+      actionview (= 4.2.0.beta1)
+      activejob (= 4.2.0.beta1)
+      activemodel (= 4.2.0.beta1)
+      activerecord (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.0.beta1)
+      sprockets-rails (~> 3.0.0.beta1)
+    railties (4.2.0.beta1)
+      actionpack (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+
+GIT
+  remote: https://github.com/rails/sass-rails.git
+  revision: 423178729e7b84addcee78b33891644b1fc1705b
+  specs:
+    sass-rails (5.0.0.beta1)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2)
+      sprockets (~> 2.12)
+      sprockets-rails (>= 2.0, < 4.0)
+
+PATH
+  remote: vendor/gems/rails_multisite
+  specs:
+    rails_multisite (0.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    active_model_serializers (0.8.2)
+      activemodel (>= 3.0)
+    addressable (2.3.6)
+    airbrake (3.1.2)
+      activesupport
+      builder
+    annotate (2.6.5)
+      activerecord (>= 2.3.0)
+      rake (>= 0.8.7)
+    arel (6.0.0.beta1)
+    barber (0.4.2)
+      ember-source
+      execjs
+      handlebars-source
+    better_errors (2.0.0)
+      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)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    certified (1.0.0)
+    coderay (1.1.0)
+    connection_pool (2.0.0)
+    crass (0.2.1)
+    daemons (1.1.9)
+    debug_inspector (0.0.2)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    dotenv (0.11.1)
+      dotenv-deployment (~> 0.0.2)
+    dotenv-deployment (0.0.2)
+    email_reply_parser-discourse (0.6)
+    ember-data-source (1.0.0.beta.9)
+      ember-source
+    ember-rails (0.15.0)
+      active_model_serializers
+      barber (>= 0.4.1)
+      ember-data-source (>= 1.0.0.beta.5)
+      ember-source (>= 1.1.0)
+      execjs (>= 1.2)
+      handlebars-source (> 1.0.0)
+      jquery-rails (>= 1.0.17)
+      railties (>= 3.1)
+    ember-source (1.6.0.beta.2)
+      handlebars-source (~> 1.0)
+    erubis (2.7.0)
+    eventmachine (1.0.3)
+    excon (0.39.5)
+    execjs (2.2.1)
+    exifr (1.1.3)
+    fabrication (2.11.3)
+    fakeweb (1.3.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    fast_blank (0.0.2)
+    fast_stack (0.1.0)
+      rake
+      rake-compiler
+    fast_xor (1.1.3)
+      rake
+      rake-compiler
+    fast_xs (0.8.0)
+    fastimage (1.6.3)
+      addressable (~> 2.3, >= 2.3.5)
+    ffi (1.9.3)
+    flamegraph (0.0.5)
+      fast_stack
+    fog (1.22.1)
+      fog-brightbox
+      fog-core (~> 1.22)
+      fog-json
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-brightbox (0.5.0)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto
+    fog-core (1.24.0)
+      builder
+      excon (~> 0.38)
+      formatador (~> 0.2)
+      mime-types
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+    fog-json (1.0.0)
+      multi_json (~> 1.0)
+    foreman (0.75.0)
+      dotenv (~> 0.11.1)
+      thor (~> 0.19.1)
+    formatador (0.2.5)
+    fspath (2.0.6)
+    gctools (0.2.3)
+    given_core (3.5.4)
+      sorcerer (>= 0.3.7)
+    globalid (0.2.3)
+      activesupport (>= 4.1.0)
+    guess_html_encoding (0.0.9)
+    handlebars-source (1.3.0)
+    hashie (3.3.1)
+    highline (1.6.21)
+    hike (1.2.3)
+    hiredis (0.5.2)
+    htmlentities (4.3.2)
+    i18n (0.7.0.beta1)
+    image_optim (0.9.1)
+      exifr (~> 1.1.3)
+      fspath (~> 2.0.5)
+      image_size (~> 1.1.2)
+      in_threads (~> 1.2.0)
+      progress (~> 3.0.0)
+    image_size (1.1.5)
+    in_threads (1.2.2)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
+    jquery-rails (3.1.2)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    jwt (1.0.0)
+    kgio (2.9.2)
+    librarian (0.1.2)
+      highline
+      thor (~> 0.15)
+    libv8 (3.16.14.3)
+    listen (0.7.3)
+    logster (0.1.6)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    lru_redux (0.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    memory_profiler (0.0.4)
+    message_bus (0.9.5)
+      eventmachine
+      rack (>= 1.1.3)
+      redis
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    minitest (5.4.1)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    mock_redis (0.13.2)
+    moneta (0.8.0)
+    msgpack (0.5.8)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    mustache (0.99.6)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
+    netrc (0.7.7)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    nokogumbo (1.1.12)
+      nokogiri
+    oauth (0.4.7)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    oj (2.10.2)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
+    omniauth-facebook (2.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-github-discourse (1.1.2)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.2.5)
+      omniauth (> 1.0)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-oauth (1.0.1)
+      oauth
+      omniauth (~> 1.0)
+    omniauth-oauth2 (1.2.0)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
+    omniauth-twitter (1.0.1)
+      multi_json (~> 1.3)
+      omniauth-oauth (~> 1.0)
+    onebox (1.4.9)
+      moneta (~> 0.7)
+      multi_json (~> 1.7)
+      mustache (~> 0.99)
+      nokogiri (~> 1.6.1)
+    openid-redis-store (0.0.2)
+      redis
+      ruby-openid
+    pg (0.15.1)
+    polyglot (0.3.5)
+    progress (3.0.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
+    pry-rails (0.3.2)
+      pry (>= 0.9.10)
+    puma (2.9.0)
+      rack (>= 1.1, < 2.0)
+    qunit-rails (0.0.7)
+      railties
+    rack (1.6.0.beta)
+    rack-mini-profiler (0.9.2)
+      rack (>= 1.1.3)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.2)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.2)
+      activesupport
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.0)
+      loofah (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
+    raindrops (0.13.0)
+    rake (10.3.2)
+    rake-compiler (0.9.3)
+      rake
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rbtrace (0.4.5)
+      ffi (>= 1.0.6)
+      msgpack (>= 0.4.3)
+      trollop (>= 1.16.2)
+    redcarpet (3.1.2)
+    redis (3.1.0)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
+    ref (1.0.5)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rinku (1.7.3)
+    rmmseg-cpp (0.2.9)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-given (3.5.4)
+      given_core (= 3.5.4)
+      rspec (>= 2.12)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    rtlit (0.0.5)
+    ruby-openid (2.5.0)
+    ruby-readability (0.7.0)
+      guess_html_encoding (>= 0.0.4)
+      nokogiri (>= 1.6.0)
+    sanitize (3.0.2)
+      crass (~> 0.2.0)
+      nokogiri (>= 1.4.4)
+      nokogumbo (= 1.1.12)
+    sass (3.4.2)
+    seed-fu (2.3.3)
+      activerecord (>= 3.1, < 4.2)
+      activesupport (>= 3.1, < 4.2)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.7.0)
+      activesupport (>= 3.0.0)
+    sidekiq (3.2.3)
+      celluloid (>= 0.15.2)
+      connection_pool (>= 2.0.0)
+      json
+      redis (>= 3.0.6)
+      redis-namespace (>= 1.3.1)
+    simple-rss (1.3.1)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    slop (3.6.0)
+    sorcerer (1.0.2)
+    spork (1.0.0rc4)
+    spork-rails (4.0.0)
+      rails (>= 3.0.0, < 5)
+      spork (>= 1.0rc0)
+    sprockets (2.12.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (3.0.0.beta1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (~> 2.8)
+    stackprof (0.2.7)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
+    thin (1.6.2)
+      daemons (>= 1.0.9)
+      eventmachine (>= 1.0.0)
+      rack (>= 1.0.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    timecop (0.7.1)
+    timers (1.1.0)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    trollop (2.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.5.3)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
+    unicorn (4.8.3)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack-action_caching!
+  active_model_serializers (~> 0.8.0)
+  airbrake (= 3.1.2)
+  annotate
+  barber
+  better_errors
+  binding_of_caller
+  certified
+  email_reply_parser-discourse
+  ember-rails
+  ember-source (= 1.6.0.beta.2)
+  eventmachine
+  fabrication
+  fakeweb (~> 1.3.0)
+  fast_blank
+  fast_xor
+  fast_xs
+  fastimage
+  flamegraph
+  fog (= 1.22.1)
+  foreman
+  gctools
+  handlebars-source (= 1.3.0)
+  highline
+  hiredis
+  htmlentities
+  image_optim (= 0.9.1)
+  librarian (>= 0.0.25)
+  listen (= 0.7.3)
+  logster
+  lru_redux
+  mail (~> 2.5.4)
+  memory_profiler
+  message_bus
+  minitest
+  mocha
+  mock_redis
+  multi_json
+  mustache
+  nokogiri
+  oj
+  omniauth
+  omniauth-facebook
+  omniauth-github-discourse
+  omniauth-google-oauth2
+  omniauth-oauth2
+  omniauth-openid
+  omniauth-twitter
+  onebox
+  openid-redis-store
+  pg (= 0.15.1)
+  pry-nav
+  pry-rails
+  puma
+  qunit-rails
+  rack-mini-profiler
+  rack-protection
+  rails!
+  rails-observers
+  rails_multisite!
+  rake
+  rb-fsevent
+  rb-inotify (~> 0.9)
+  rbtrace
+  redcarpet
+  redis
+  rest-client
+  rinku
+  rmmseg-cpp
+  rspec-given
+  rspec-rails
+  rtlit
+  ruby-readability
+  sanitize
+  sass
+  sass-rails!
+  seed-fu (~> 2.3.3)
+  shoulda
+  sidekiq
+  simple-rss
+  simplecov
+  sinatra
+  spork-rails
+  stackprof
+  therubyracer
+  thin
+  timecop
+  uglifier
+  unf
+  unicorn