Skip to content

Commit

Permalink
Cross-Origin Resource Sharing #53 (testing gem dependencies)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikaelsvensson committed Aug 22, 2015
1 parent bee1f1e commit f5b4bff
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 47 deletions.
22 changes: 12 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

ruby '2.0.0'

gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
gem 'tzinfo-data', '1.2015.4', platforms: [:mingw, :mswin, :x64_mingw]

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.1.8'
Expand All @@ -20,23 +20,23 @@ gem 'google-id-token', git: 'https://github.com/Nerian/google-id-token.git'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.3'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
#gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0'
gem 'coffee-script', '2.2.0'
gem 'coffee-script-source', '1.8.0'
#gem 'coffee-rails', '~> 4.0.0'
#gem 'coffee-script', '2.2.0'
#gem 'coffee-script-source', '1.8.0'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
gem 'jquery-rails', '3.1.2'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
#gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
gem 'jbuilder', '2.2.16'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
#gem 'sdoc', '~> 0.4.0', group: :doc

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', group: :development
Expand All @@ -56,4 +56,6 @@ gem 'unicorn', '~> 4.9.0', :group => :production
# Use Pundit for authorization
gem 'pundit', '1.0.0'

gem 'rack-cors', :require => 'rack/cors'
gem 'rack-cors', :require => 'rack/cors'

gem 'json', '1.8.2'
51 changes: 14 additions & 37 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/Nerian/google-id-token.git
revision: c34185e807bb28b48c7b980a50eb37b2614bf3d7
revision: 59285ac4be9f7efecb197618211023d27969400b
specs:
google-id-token (1.2.0)
jwt
Expand Down Expand Up @@ -37,17 +37,9 @@ GEM
tzinfo (~> 1.1)
arel (5.0.1.20140414130214)
builder (3.2.2)
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.8.0)
daemons (1.2.2)
daemons (1.2.3)
erubis (2.7.0)
eventmachine (1.0.7)
execjs (2.6.0)
eventmachine (1.0.8)
hike (1.2.3)
i18n (0.7.0)
jbuilder (2.2.16)
Expand All @@ -57,19 +49,19 @@ GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.2)
jwt (1.5.0)
jwt (1.5.1)
kgio (2.9.3)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.6.1)
minitest (5.7.0)
multi_json (1.11.0)
minitest (5.8.0)
multi_json (1.11.2)
pg (0.18.2)
pg (0.18.2-x64-mingw32)
pg (0.18.2-x86-mingw32)
pundit (1.0.0)
activesupport (>= 3.0.0)
rack (1.5.3)
rack (1.5.5)
rack-cors (0.4.0)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -88,26 +80,21 @@ GEM
activesupport (= 4.1.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
raindrops (0.15.0)
rake (10.4.2)
rdoc (4.2.0)
json (~> 1.4)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (1.3.6)
sprockets (2.12.3)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.3.1)
sprockets-rails (2.3.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
Expand All @@ -121,15 +108,10 @@ GEM
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
tzinfo-data (1.2015.4)
tzinfo (>= 1.0.0)
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.9.0)
kgio (~> 2.6)
rack
Expand All @@ -141,24 +123,19 @@ PLATFORMS
x86-mingw32

DEPENDENCIES
coffee-rails (~> 4.0.0)
coffee-script (= 2.2.0)
coffee-script-source (= 1.8.0)
google-id-token!
jbuilder (~> 2.0)
jquery-rails
jbuilder (= 2.2.16)
jquery-rails (= 3.1.2)
json (= 1.8.2)
pg
pundit (= 1.0.0)
rack-cors
rails (= 4.1.8)
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
spring
sqlite3
thin
turbolinks
tzinfo-data
uglifier (>= 1.3.0)
tzinfo-data (= 1.2015.4)
unicorn (~> 4.9.0)

BUNDLED WITH
Expand Down

0 comments on commit f5b4bff

Please sign in to comment.