Use travis-core from ps-settings-encryption branch
This commit is contained in:
parent
e9cdef1c9b
commit
5b0af64959
4
Gemfile
4
Gemfile
|
@ -3,11 +3,12 @@ ruby '2.0.0'
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
gemspec
|
gemspec
|
||||||
|
|
||||||
gem 'travis-core', github: 'travis-ci/travis-core'
|
gem 'travis-core', github: 'travis-ci/travis-core', branch: 'ps-settings-encryption'
|
||||||
gem 'travis-support', github: 'travis-ci/travis-support'
|
gem 'travis-support', github: 'travis-ci/travis-support'
|
||||||
gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
|
gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
|
||||||
gem 'sinatra'
|
gem 'sinatra'
|
||||||
gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
|
gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
|
||||||
|
gem 'debugger'
|
||||||
|
|
||||||
gem 'active_model_serializers'
|
gem 'active_model_serializers'
|
||||||
gem 'unicorn'
|
gem 'unicorn'
|
||||||
|
@ -32,7 +33,6 @@ end
|
||||||
group :development do
|
group :development do
|
||||||
gem 'foreman'
|
gem 'foreman'
|
||||||
gem 'rerun'
|
gem 'rerun'
|
||||||
# gem 'debugger'
|
|
||||||
gem 'rb-fsevent', '~> 0.9.1'
|
gem 'rb-fsevent', '~> 0.9.1'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
18
Gemfile.lock
18
Gemfile.lock
|
@ -23,12 +23,14 @@ GIT
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/travis-ci/travis-core.git
|
remote: git://github.com/travis-ci/travis-core.git
|
||||||
revision: dd94b9d19ac4cc33f383f740194ba1b3c6a73d3a
|
revision: bb1b9584dfd970fb6ab1d6b6b3efbbacc51e1970
|
||||||
|
branch: ps-settings-encryption
|
||||||
specs:
|
specs:
|
||||||
travis-core (0.0.1)
|
travis-core (0.0.1)
|
||||||
actionmailer (~> 3.2.12)
|
actionmailer (~> 3.2.12)
|
||||||
activerecord (~> 3.2.12)
|
activerecord (~> 3.2.12)
|
||||||
coder (~> 0.4.0)
|
coder (~> 0.4.0)
|
||||||
|
coercible (~> 1.0.0)
|
||||||
data_migrations (~> 0.0.1)
|
data_migrations (~> 0.0.1)
|
||||||
gh
|
gh
|
||||||
hashr (~> 0.0.19)
|
hashr (~> 0.0.19)
|
||||||
|
@ -121,6 +123,9 @@ GEM
|
||||||
timers (>= 1.0.0)
|
timers (>= 1.0.0)
|
||||||
coder (0.4.0)
|
coder (0.4.0)
|
||||||
coderay (1.1.0)
|
coderay (1.1.0)
|
||||||
|
coercible (1.0.0)
|
||||||
|
descendants_tracker (~> 0.0.1)
|
||||||
|
columnize (0.3.6)
|
||||||
connection_pool (0.9.3)
|
connection_pool (0.9.3)
|
||||||
daemons (1.1.9)
|
daemons (1.1.9)
|
||||||
dalli (2.6.4)
|
dalli (2.6.4)
|
||||||
|
@ -128,6 +133,14 @@ GEM
|
||||||
activerecord
|
activerecord
|
||||||
rake
|
rake
|
||||||
database_cleaner (0.8.0)
|
database_cleaner (0.8.0)
|
||||||
|
debugger (1.6.2)
|
||||||
|
columnize (>= 0.3.1)
|
||||||
|
debugger-linecache (~> 1.2.0)
|
||||||
|
debugger-ruby_core_source (~> 1.2.3)
|
||||||
|
debugger-linecache (1.2.0)
|
||||||
|
debugger-ruby_core_source (1.2.3)
|
||||||
|
descendants_tracker (0.0.4)
|
||||||
|
thread_safe (~> 0.3, >= 0.3.1)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
dotenv (0.9.0)
|
dotenv (0.9.0)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
|
@ -264,6 +277,8 @@ GEM
|
||||||
eventmachine (>= 1.0.0)
|
eventmachine (>= 1.0.0)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
thor (0.14.6)
|
thor (0.14.6)
|
||||||
|
thread_safe (0.3.1)
|
||||||
|
atomic (>= 1.1.7, < 2)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timers (1.1.0)
|
timers (1.1.0)
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
|
@ -285,6 +300,7 @@ DEPENDENCIES
|
||||||
bunny (~> 0.8.0)
|
bunny (~> 0.8.0)
|
||||||
dalli
|
dalli
|
||||||
database_cleaner (~> 0.8.0)
|
database_cleaner (~> 0.8.0)
|
||||||
|
debugger
|
||||||
factory_girl (~> 2.4.0)
|
factory_girl (~> 2.4.0)
|
||||||
foreman
|
foreman
|
||||||
gh
|
gh
|
||||||
|
|
Loading…
Reference in New Issue
Block a user