Skip to content

Commit

Permalink
cp settings.yml; bundle update
Browse files Browse the repository at this point in the history
  • Loading branch information
@tadyjp
tadyjp committed Feb 21, 2014
1 parent 6284b69 commit 6190324
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 61 deletions.
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ rvm:
before_script:
- mysql -e 'CREATE DATABASE rendezvous_test;'
- cp config/database.yml.example config/database.yml
- cp config/settings.yml.example config/settings.yml
env:
- DB_TEST_DATABASE=rendezvous_test DB_TEST_USER=travis
130 changes: 69 additions & 61 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,33 @@ GIT

GIT
remote: git://github.com/vmg/redcarpet.git
revision: 0c4cd0e7ea5f7f44e2953f3013fdf751af91162d
revision: e627bee83b80fd440fc7edb609def9cb4393e332
branch: master
specs:
redcarpet (3.0.0)
redcarpet (3.1.1)

GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.2)
actionpack (= 4.0.2)
actionmailer (4.0.3)
actionpack (= 4.0.3)
mail (~> 2.5.4)
actionpack (4.0.2)
activesupport (= 4.0.2)
actionpack (4.0.3)
activesupport (= 4.0.3)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.2)
activesupport (= 4.0.2)
activemodel (4.0.3)
activesupport (= 4.0.3)
builder (~> 3.1.0)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord (4.0.3)
activemodel (= 4.0.3)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.2)
activesupport (= 4.0.3)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.2)
activesupport (4.0.3)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
Expand All @@ -44,7 +44,7 @@ GEM
addressable (2.3.5)
ancestry (2.0.0)
activerecord (>= 3.0.0)
arel (4.0.1)
arel (4.0.2)
ast (1.1.0)
atomic (1.1.14)
bcrypt-ruby (3.1.2)
Expand Down Expand Up @@ -75,6 +75,9 @@ GEM
xpath (~> 2.0)
celluloid (0.15.2)
timers (~> 1.1.0)
celluloid-io (0.15.0)
celluloid (>= 0.15.0)
nio4r (>= 0.5.0)
cliver (0.3.2)
coderay (1.1.0)
coffee-rails (4.0.1)
Expand All @@ -83,7 +86,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.3)
coffee-script-source (1.7.0)
coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
Expand All @@ -95,66 +98,66 @@ GEM
daemons (1.1.9)
database_rewinder (0.0.2)
debug_inspector (0.0.2)
devise (3.2.2)
devise (3.2.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
docile (1.1.2)
domain_name (0.5.15)
docile (1.1.3)
domain_name (0.5.16)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
factory_girl (4.3.0)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.3.0)
factory_girl (~> 4.3.0)
factory_girl_rails (4.4.0)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.3)
formatador (0.2.4)
gmail_xoauth (0.4.1)
oauth (>= 0.3.6)
guard (2.2.5)
guard (2.4.0)
formatador (>= 0.2.4)
listen (~> 2.1)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-rspec (4.2.3)
guard-rspec (4.2.6)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
guard-rubocop (1.0.1)
guard-rubocop (1.0.2)
guard (~> 2.0)
rubocop (~> 0.10)
hashie (2.0.5)
hike (1.2.3)
htmlentities (4.3.1)
http-cookie (1.0.2)
domain_name (~> 0.5)
httpauth (0.2.0)
i18n (0.6.9)
i18n_generators (1.2.1)
mechanize
rails (>= 3.0.0)
jbuilder (2.0.2)
jbuilder (2.0.3)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-rails (3.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
jwt (0.1.10)
jwt (0.1.11)
multi_json (>= 1.5)
launchy (2.4.2)
addressable (~> 2.3)
libv8 (3.16.14.3)
listen (2.4.0)
listen (2.5.0)
celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.4)
Expand All @@ -175,32 +178,36 @@ GEM
mini_portile (0.5.2)
minitest (4.7.5)
multi_json (1.8.4)
multi_xml (0.5.5)
multipart-post (2.0.0)
mysql2 (0.3.14)
mysql2 (0.3.15)
net-http-digest_auth (1.4)
net-http-persistent (2.9)
net-http-persistent (2.9.4)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.8.0)
nio4r (1.0.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
ntlm-http (0.1.1)
oauth (0.4.7)
oauth2 (0.8.1)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
multi_json (~> 1.0)
oauth2 (0.9.3)
faraday (>= 0.8, < 0.10)
jwt (~> 0.1.8)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.2.1)
hashie (>= 1.2, < 3)
rack (~> 1.0)
omniauth-google-oauth2 (0.2.2)
omniauth (~> 1.0)
omniauth-oauth2
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
omniauth-oauth2 (1.1.2)
faraday (>= 0.8, < 0.10)
multi_json (~> 1.3)
oauth2 (~> 0.9.3)
omniauth (~> 1.2)
orm_adapter (0.5.0)
parser (2.1.4)
ast (~> 1.1)
Expand All @@ -210,12 +217,12 @@ GEM
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.3)
polyglot (0.3.4)
powerpack (0.0.9)
premailer (1.8.0)
css_parser (>= 1.3.5)
htmlentities (>= 4.0.0)
pry (0.9.12.4)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
Expand All @@ -226,20 +233,20 @@ GEM
rack (>= 1.1.3)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
rails (4.0.3)
actionmailer (= 4.0.3)
actionpack (= 4.0.3)
activerecord (= 4.0.3)
activesupport (= 4.0.3)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.2)
railties (= 4.0.3)
sprockets-rails (~> 2.0.0)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
railties (4.0.3)
actionpack (= 4.0.3)
activesupport (= 4.0.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (1.99.1)
rainbow (2.0.0)
rake (10.1.1)
rb-fsevent (0.9.4)
rb-inotify (0.9.3)
Expand All @@ -254,9 +261,9 @@ GEM
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4)
rspec-mocks (2.14.6)
rspec-rails (2.14.1)
actionpack (>= 3.0)
activemodel (>= 3.0)
Expand All @@ -265,11 +272,12 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rubocop (0.16.0)
parser (~> 2.1)
rubocop (0.18.1)
json (>= 1.7.7, < 2)
parser (~> 2.1.3)
powerpack (~> 0.0.6)
rainbow (>= 1.1.4)
sass (3.2.13)
rainbow (>= 1.99.1, < 3.0)
sass (3.2.14)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
Expand All @@ -284,7 +292,7 @@ GEM
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.4.7)
sprockets (2.10.1)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -297,9 +305,9 @@ GEM
net-scp (>= 1.1.2)
net-ssh
term-ansicolor
term-ansicolor (1.2.2)
tins (~> 0.8)
therubyracer (0.12.0)
term-ansicolor (1.3.0)
tins (~> 1.0)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
thin (1.6.1)
Expand All @@ -311,7 +319,7 @@ GEM
atomic
tilt (1.4.1)
timers (1.1.0)
tins (0.13.1)
tins (1.0.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
Expand Down

0 comments on commit 6190324

Please sign in to comment.