fixes for new server
This commit is contained in:
4
Gemfile
4
Gemfile
@@ -1,7 +1,7 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '3.2.9'
|
gem 'rails', '3.2.13'
|
||||||
|
gem 'sprockets', '2.2.2'
|
||||||
# Bundle edge Rails instead:
|
# Bundle edge Rails instead:
|
||||||
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
||||||
gem 'mysql2'
|
gem 'mysql2'
|
||||||
|
|||||||
69
Gemfile.lock
69
Gemfile.lock
@@ -9,32 +9,32 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.2.9)
|
actionmailer (3.2.13)
|
||||||
actionpack (= 3.2.9)
|
actionpack (= 3.2.13)
|
||||||
mail (~> 2.4.4)
|
mail (~> 2.5.3)
|
||||||
actionpack (3.2.9)
|
actionpack (3.2.13)
|
||||||
activemodel (= 3.2.9)
|
activemodel (= 3.2.13)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.13)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.4)
|
journey (~> 1.0.4)
|
||||||
rack (~> 1.4.0)
|
rack (~> 1.4.5)
|
||||||
rack-cache (~> 1.2)
|
rack-cache (~> 1.2)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.2.1)
|
sprockets (~> 2.2.1)
|
||||||
activemodel (3.2.9)
|
activemodel (3.2.13)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.13)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.9)
|
activerecord (3.2.13)
|
||||||
activemodel (= 3.2.9)
|
activemodel (= 3.2.13)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.13)
|
||||||
arel (~> 3.0.2)
|
arel (~> 3.0.2)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.2.9)
|
activeresource (3.2.13)
|
||||||
activemodel (= 3.2.9)
|
activemodel (= 3.2.13)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.13)
|
||||||
activesupport (3.2.9)
|
activesupport (3.2.13)
|
||||||
i18n (~> 0.6)
|
i18n (= 0.6.1)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
annotate (2.6.1)
|
annotate (2.6.1)
|
||||||
activerecord (>= 2.3.0)
|
activerecord (>= 2.3.0)
|
||||||
@@ -96,7 +96,7 @@ GEM
|
|||||||
hashie (2.0.5)
|
hashie (2.0.5)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
httpauth (0.2.0)
|
httpauth (0.2.0)
|
||||||
i18n (0.6.9)
|
i18n (0.6.1)
|
||||||
journey (1.0.4)
|
journey (1.0.4)
|
||||||
jquery-fileupload-rails (0.4.1)
|
jquery-fileupload-rails (0.4.1)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
@@ -104,17 +104,18 @@ GEM
|
|||||||
jquery-rails (3.0.4)
|
jquery-rails (3.0.4)
|
||||||
railties (>= 3.0, < 5.0)
|
railties (>= 3.0, < 5.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
|
jquery-ui-rails (4.1.1)
|
||||||
|
railties (>= 3.1.0)
|
||||||
json (1.8.1)
|
json (1.8.1)
|
||||||
jwt (0.1.8)
|
jwt (0.1.8)
|
||||||
multi_json (>= 1.5)
|
multi_json (>= 1.5)
|
||||||
libv8 (3.16.14.3)
|
libv8 (3.16.14.3)
|
||||||
mail (2.4.4)
|
mail (2.5.4)
|
||||||
i18n (>= 0.4.0)
|
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_portile (0.5.2)
|
mini_portile (0.5.2)
|
||||||
multi_json (1.8.2)
|
multi_json (1.8.4)
|
||||||
multipart-post (1.2.0)
|
multipart-post (1.2.0)
|
||||||
mysql2 (0.3.14)
|
mysql2 (0.3.14)
|
||||||
net-ldap (0.3.1)
|
net-ldap (0.3.1)
|
||||||
@@ -155,17 +156,17 @@ GEM
|
|||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.9)
|
rails (3.2.13)
|
||||||
actionmailer (= 3.2.9)
|
actionmailer (= 3.2.13)
|
||||||
actionpack (= 3.2.9)
|
actionpack (= 3.2.13)
|
||||||
activerecord (= 3.2.9)
|
activerecord (= 3.2.13)
|
||||||
activeresource (= 3.2.9)
|
activeresource (= 3.2.13)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.13)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.9)
|
railties (= 3.2.13)
|
||||||
railties (3.2.9)
|
railties (3.2.13)
|
||||||
actionpack (= 3.2.9)
|
actionpack (= 3.2.13)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.13)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
@@ -199,7 +200,7 @@ GEM
|
|||||||
seed_dump (0.5.3)
|
seed_dump (0.5.3)
|
||||||
simple_calendar (0.1.9)
|
simple_calendar (0.1.9)
|
||||||
rails (>= 3.0)
|
rails (>= 3.0)
|
||||||
sprockets (2.2.1)
|
sprockets (2.2.2)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
@@ -246,13 +247,14 @@ DEPENDENCIES
|
|||||||
haml
|
haml
|
||||||
jquery-fileupload-rails
|
jquery-fileupload-rails
|
||||||
jquery-rails
|
jquery-rails
|
||||||
|
jquery-ui-rails (~> 4.1.1)
|
||||||
mysql2
|
mysql2
|
||||||
omniauth
|
omniauth
|
||||||
omniauth-facebook
|
omniauth-facebook
|
||||||
omniauth-ldap
|
omniauth-ldap
|
||||||
paper_trail (>= 2.7.0)!
|
paper_trail (>= 2.7.0)!
|
||||||
paperclip (~> 3.4.0)
|
paperclip (~> 3.4.0)
|
||||||
rails (= 3.2.9)
|
rails (= 3.2.13)
|
||||||
rmagick
|
rmagick
|
||||||
rolify
|
rolify
|
||||||
rspec-rails
|
rspec-rails
|
||||||
@@ -260,6 +262,7 @@ DEPENDENCIES
|
|||||||
sass-rails (~> 3.2)
|
sass-rails (~> 3.2)
|
||||||
seed_dump (~> 0.5.3)
|
seed_dump (~> 0.5.3)
|
||||||
simple_calendar (~> 0.1.9)
|
simple_calendar (~> 0.1.9)
|
||||||
|
sprockets (= 2.2.2)
|
||||||
sqlite3
|
sqlite3
|
||||||
themes_for_rails
|
themes_for_rails
|
||||||
therubyracer
|
therubyracer
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ production:
|
|||||||
encoding: utf8
|
encoding: utf8
|
||||||
database: test1production
|
database: test1production
|
||||||
pool: 5
|
pool: 5
|
||||||
username: root
|
username: fetsite
|
||||||
password: changeme
|
password: quaish3J
|
||||||
socket: /var/run/mysqld/mysqld.sock
|
socket: /var/run/mysqld/mysqld.sock
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ Fetsite::Application.configure do
|
|||||||
# config.action_controller.asset_host = "http://assets.example.com"
|
# config.action_controller.asset_host = "http://assets.example.com"
|
||||||
|
|
||||||
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
|
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
|
||||||
# config.assets.precompile += %w( search.js )
|
# config.assets.precompile += %w( search.js )
|
||||||
|
|
||||||
# Disable delivery errors, bad email addresses will be ignored
|
# Disable delivery errors, bad email addresses will be ignored
|
||||||
# config.action_mailer.raise_delivery_errors = false
|
# config.action_mailer.raise_delivery_errors = false
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
I18n.default_locale = :de
|
I18n.default_locale = :de
|
||||||
|
|||||||
Reference in New Issue
Block a user