adding salaam for the real work to start
This commit is contained in:
parent
456fdc93e1
commit
6961ae3030
4
Gemfile
4
Gemfile
@ -15,6 +15,10 @@ gem 'uglifier', '>= 2.4.0', require: false
|
||||
|
||||
gem 'opal-pixi' , :path => "../opal-pixi"
|
||||
|
||||
#gem "salama" , "0.2" , :path => "../salama"
|
||||
gem "salama"
|
||||
|
||||
|
||||
group :test do
|
||||
# Testing dependencies
|
||||
gem 'rspec', '~> 3.2.0'
|
||||
|
12
Gemfile.lock
12
Gemfile.lock
@ -1,13 +1,14 @@
|
||||
PATH
|
||||
remote: ../opal-pixi
|
||||
specs:
|
||||
opal-pixi (0.0.1)
|
||||
opal-pixi (0.1.0)
|
||||
opal (~> 0.7.0)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
bcrypt (3.1.10)
|
||||
blankslate (3.1.3)
|
||||
bson (1.9.2)
|
||||
bson_ext (1.9.2)
|
||||
bson (~> 1.9.2)
|
||||
@ -58,6 +59,8 @@ GEM
|
||||
tilt (~> 1.4)
|
||||
opal-rspec (0.4.3)
|
||||
opal (>= 0.7.0, < 0.9)
|
||||
parslet (1.7.0)
|
||||
blankslate (>= 2.0, <= 4.0)
|
||||
poltergeist (1.5.1)
|
||||
capybara (~> 2.1)
|
||||
cliver (~> 0.3.1)
|
||||
@ -88,6 +91,12 @@ GEM
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.2)
|
||||
rubyzip (1.1.7)
|
||||
salama (0.2.0)
|
||||
salama-object-file (~> 0.2)
|
||||
salama-reader (~> 0.2)
|
||||
salama-object-file (0.2.0)
|
||||
salama-reader (0.2.0)
|
||||
parslet (~> 1.7.0)
|
||||
sass (3.2.19)
|
||||
selenium-webdriver (2.43.0)
|
||||
childprocess (~> 0.5)
|
||||
@ -149,6 +158,7 @@ DEPENDENCIES
|
||||
opal-rspec (~> 0.4.2)
|
||||
poltergeist (~> 1.5.0)
|
||||
rspec (~> 3.2.0)
|
||||
salama
|
||||
selenium-webdriver (~> 2.43.0)
|
||||
thin (~> 1.6.0)
|
||||
uglifier (>= 2.4.0)
|
||||
|
@ -1,6 +1,8 @@
|
||||
# app.rb is used to configure your app. This code is only run on the server,
|
||||
# then any config options in config.public are passed to the client as well.
|
||||
|
||||
require "salama"
|
||||
|
||||
Volt.configure do |config|
|
||||
# Setup your global app config here.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user