diff --git a/Gemfile b/Gemfile index 67fb72a..222dcac 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' -gem 'rails', '3.2.9' - +gem 'rails', '3.2.13' +gem 'sprockets', '2.2.2' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' gem 'mysql2' diff --git a/Gemfile.lock b/Gemfile.lock index ec202a2..c2a82fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,32 +9,32 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.9) - actionpack (= 3.2.9) - mail (~> 2.4.4) - actionpack (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + actionmailer (3.2.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.9) - activesupport (= 3.2.9) + activemodel (3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) - activesupport (3.2.9) - i18n (~> 0.6) + activeresource (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) annotate (2.6.1) activerecord (>= 2.3.0) @@ -96,7 +96,7 @@ GEM hashie (2.0.5) hike (1.2.3) httpauth (0.2.0) - i18n (0.6.9) + i18n (0.6.1) journey (1.0.4) jquery-fileupload-rails (0.4.1) actionpack (>= 3.1) @@ -104,17 +104,18 @@ GEM jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (4.1.1) + railties (>= 3.1.0) json (1.8.1) jwt (0.1.8) multi_json (>= 1.5) libv8 (3.16.14.3) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) mini_portile (0.5.2) - multi_json (1.8.2) + multi_json (1.8.4) multipart-post (1.2.0) mysql2 (0.3.14) net-ldap (0.3.1) @@ -155,17 +156,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.9) - actionmailer (= 3.2.9) - actionpack (= 3.2.9) - activerecord (= 3.2.9) - activeresource (= 3.2.9) - activesupport (= 3.2.9) + rails (3.2.13) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) bundler (~> 1.0) - railties (= 3.2.9) - railties (3.2.9) - actionpack (= 3.2.9) - activesupport (= 3.2.9) + railties (= 3.2.13) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -199,7 +200,7 @@ GEM seed_dump (0.5.3) simple_calendar (0.1.9) rails (>= 3.0) - sprockets (2.2.1) + sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -246,13 +247,14 @@ DEPENDENCIES haml jquery-fileupload-rails jquery-rails + jquery-ui-rails (~> 4.1.1) mysql2 omniauth omniauth-facebook omniauth-ldap paper_trail (>= 2.7.0)! paperclip (~> 3.4.0) - rails (= 3.2.9) + rails (= 3.2.13) rmagick rolify rspec-rails @@ -260,6 +262,7 @@ DEPENDENCIES sass-rails (~> 3.2) seed_dump (~> 0.5.3) simple_calendar (~> 0.1.9) + sprockets (= 2.2.2) sqlite3 themes_for_rails therubyracer diff --git a/config/database.yml b/config/database.yml index e7882ce..a72afde 100755 --- a/config/database.yml +++ b/config/database.yml @@ -23,7 +23,7 @@ production: encoding: utf8 database: test1production pool: 5 - username: root - password: changeme + username: fetsite + password: quaish3J socket: /var/run/mysqld/mysqld.sock timeout: 5000 diff --git a/config/environments/production.rb b/config/environments/production.rb index e068077..17b6cd3 100755 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -51,7 +51,7 @@ Fetsite::Application.configure do # config.action_controller.asset_host = "http://assets.example.com" # 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 # config.action_mailer.raise_delivery_errors = false diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb index 18a3187..3e10129 100755 --- a/config/initializers/locale.rb +++ b/config/initializers/locale.rb @@ -1 +1 @@ -I18n.default_locale = :de \ No newline at end of file +I18n.default_locale = :de