Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
danascheider committed Oct 18, 2015
2 parents c7caa65 + cec9e5b commit 6514f66
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-webkit (1.7.0)
capybara-webkit (1.7.1)
capybara (>= 2.3.0, < 2.6.0)
json
colorize (0.7.7)
coveralls (0.8.2)
coveralls (0.8.3)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.10.0)
Expand All @@ -66,15 +66,15 @@ GEM
daemons (1.2.3)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.24)
domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0)
eventmachine (1.0.8)
extlib (0.9.16)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
faraday (0.9.1)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
gherkin3 (3.1.1)
gherkin3 (3.1.2)
google-api-client (0.8.6)
activesupport (>= 3.2)
addressable (~> 2.3)
Expand All @@ -93,7 +93,7 @@ GEM
memoist (~> 0.12)
multi_json (~> 1.11)
signet (~> 0.6)
highline (1.7.6)
highline (1.7.8)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
Expand All @@ -111,7 +111,7 @@ GEM
memoist (0.12.0)
mime-types (2.6.2)
mini_portile (0.6.2)
minitest (5.8.0)
minitest (5.8.1)
multi_json (1.11.2)
multi_test (0.1.2)
multipart-post (2.0.0)
Expand Down Expand Up @@ -148,7 +148,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
sequel (4.26.0)
sequel (4.27.0)
signet (0.6.1)
addressable (~> 2.3)
extlib (~> 0.9)
Expand All @@ -171,9 +171,9 @@ GEM
highline (>= 1.4.0)
term-ansicolor (1.3.2)
tins (~> 1.0)
thin (1.6.3)
thin (1.6.4)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0)
eventmachine (~> 1.0, >= 1.0.4)
rack (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
Expand Down
1 change: 1 addition & 0 deletions lib/tessitura.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class Tessitura < Sinatra::Base
end

get '/ping' do
Sequel.extension :migration, :core_extensions
db_writable = false

DB.transaction(rollback: :always) do
Expand Down
2 changes: 1 addition & 1 deletion tessitura.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Gem::Specification.new do |s|

s.name = 'tessitura'
s.version = TessituraPackage::Version::STRING
s.date = '2015-09-17'
s.date = '2015-10-18'
s.summary = 'Tessitura task management for opera singers'
s.authors = ['Dana Scheider']

Expand Down
2 changes: 1 addition & 1 deletion version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module Version
MAJOR = '0'
MINOR = '4'
PATCH = '0'
PRE = 'alpha1'
PRE = 'alpha2'

STRING = [MAJOR, MINOR, PATCH, PRE].join('.').chomp('.')
end
Expand Down

0 comments on commit 6514f66

Please sign in to comment.