Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 58 additions and 70 deletions.
  1. +2 −2 Gemfile
  2. +46 −58 Gemfile.lock
  3. +10 −10 config/database.rb
View
4 Gemfile
@@ -1,6 +1,6 @@
source :rubygems
-PADRINO_VERSION = '0.10.5'
+PADRINO_VERSION = '0.10.6'
# Project requirements
gem 'rake'
@@ -25,7 +25,7 @@ gem 'activerecord'
# Test requirements
# Padrino Stable Gem
-gem 'padrino', '0.10.5'
+gem 'padrino', PADRINO_VERSION
# Datenbank-Wechsel für Heroku
group :production do
View
104 Gemfile.lock
@@ -1,25 +1,23 @@
GEM
remote: http://rubygems.org/
specs:
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activesupport (3.1.3)
+ activesupport (3.2.3)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
- arel (2.2.3)
+ addressable (2.2.8)
+ arel (3.0.2)
bcrypt-ruby (3.0.1)
- bcrypt-ruby (3.0.1-x86-mingw32)
builder (3.0.0)
data_objects (0.10.8)
addressable (~> 2.1)
- diff-lcs (1.1.3)
dm-aggregates (1.2.0)
dm-core (~> 1.2.0)
dm-constraints (1.2.0)
@@ -45,57 +43,48 @@ GEM
data_objects (= 0.10.8)
do_sqlite3 (0.10.8)
data_objects (= 0.10.8)
- do_sqlite3 (0.10.8-x86-mingw32)
- data_objects (= 0.10.8)
- faraday (0.7.6)
- addressable (~> 2.2)
+ faraday (0.8.0)
multipart-post (~> 1.1)
- rack (~> 1.1)
- grit (2.4.1)
- diff-lcs (~> 1.1)
- mime-types (~> 1.15)
haml (3.1.4)
http_router (0.10.2)
rack (>= 1.0.0)
url_mount (~> 0.2.1)
i18n (0.6.0)
- mail (2.3.0)
+ mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- multi_json (1.0.4)
+ mime-types (1.18)
+ multi_json (1.3.4)
multipart-post (1.1.5)
- padrino (0.10.5)
- padrino-admin (= 0.10.5)
- padrino-cache (= 0.10.5)
- padrino-core (= 0.10.5)
- padrino-gen (= 0.10.5)
- padrino-helpers (= 0.10.5)
- padrino-mailer (= 0.10.5)
- padrino-admin (0.10.5)
- padrino-core (= 0.10.5)
- padrino-helpers (= 0.10.5)
- padrino-cache (0.10.5)
- padrino-core (= 0.10.5)
- padrino-core (0.10.5)
- activesupport (~> 3.1.0)
+ padrino (0.10.6)
+ padrino-admin (= 0.10.6)
+ padrino-cache (= 0.10.6)
+ padrino-core (= 0.10.6)
+ padrino-gen (= 0.10.6)
+ padrino-helpers (= 0.10.6)
+ padrino-mailer (= 0.10.6)
+ padrino-admin (0.10.6)
+ padrino-core (= 0.10.6)
+ padrino-helpers (= 0.10.6)
+ padrino-cache (0.10.6)
+ padrino-core (= 0.10.6)
+ padrino-core (0.10.6)
+ activesupport (~> 3.2.0)
http_router (~> 0.10.2)
sinatra (~> 1.3.1)
thor (~> 0.14.3)
tilt (~> 1.3.0)
- padrino-gen (0.10.5)
+ padrino-gen (0.10.6)
bundler (~> 1.0)
- grit (~> 2.4.1)
- padrino-core (= 0.10.5)
- padrino-helpers (0.10.5)
+ padrino-core (= 0.10.6)
+ padrino-helpers (0.10.6)
i18n (~> 0.6)
- padrino-core (= 0.10.5)
- padrino-mailer (0.10.5)
+ padrino-core (= 0.10.6)
+ padrino-mailer (0.10.6)
mail (~> 2.3.0)
- padrino-core (= 0.10.5)
- pg (0.13.1)
- pg (0.13.1-x86-mingw32)
+ padrino-core (= 0.10.6)
+ pg (0.13.2)
polyglot (0.3.3)
rack (1.4.1)
rack-protection (1.2.0)
@@ -103,7 +92,7 @@ GEM
rake (0.9.2.2)
simple-navigation (3.7.0)
activesupport (>= 2.3.2)
- simple_oauth (0.1.5)
+ simple_oauth (0.1.7)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
@@ -117,18 +106,17 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- twitter (2.1.0)
+ twitter (2.2.6)
activesupport (>= 2.3.9, < 4)
- faraday (~> 0.7)
- multi_json (~> 1.0)
- simple_oauth (~> 0.1)
+ faraday (~> 0.8)
+ multi_json (~> 1.3)
+ simple_oauth (~> 0.1.6)
tzinfo (0.3.33)
url_mount (0.2.1)
rack
PLATFORMS
ruby
- x86-mingw32
DEPENDENCIES
activerecord
@@ -143,12 +131,12 @@ DEPENDENCIES
dm-validations
do_postgres
haml
- padrino (= 0.10.5)
- padrino-admin (= 0.10.5)
- padrino-cache (= 0.10.5)
- padrino-core (= 0.10.5)
- padrino-gen (= 0.10.5)
- padrino-helpers (= 0.10.5)
+ padrino (= 0.10.6)
+ padrino-admin (= 0.10.6)
+ padrino-cache (= 0.10.6)
+ padrino-core (= 0.10.6)
+ padrino-gen (= 0.10.6)
+ padrino-helpers (= 0.10.6)
pg
rake
sinatra-flash
View
20 config/database.rb
@@ -19,18 +19,18 @@
case Padrino.env
when :development then DataMapper.setup(:default, "sqlite3://" + Padrino.root('db', "edelbiter_development.db"))
- when :production then DataMapper.setup(:default, 'foo:admin@postgres://localhost/mydb')
+ when :production then DataMapper.setup(:default, "postgres://" + postgres.user + ":" + postgres.password + "@" + postgres.host + "/" + postgres.user)
when :test then DataMapper.setup(:default, "sqlite3://" + Padrino.root('db', "edelbiter_test.db"))
end
# config/database.rb
-postgres = URI.parse(ENV['DATABASE_URL'] || '')
+#postgres = URI.parse(ENV['DATABASE_URL'] || '')
-ActiveRecord::Base.configurations[:production] = {
- :adapter => 'postgresql',
- :encoding => 'utf8',
- :database => postgres.path[1..-1],
- :username => postgres.user,
- :password => postgres.password,
- :host => postgres.host
-}
+#ActiveRecord::Base.configurations[:production] = {
+# :adapter => 'postgresql',
+# :encoding => 'utf8',
+# :database => postgres.path[1..-1],
+# :username => postgres.user,
+# :password => postgres.password,
+# :host => postgres.host
+#}

No commit comments for this range

Something went wrong with that request. Please try again.