summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock166
-rw-r--r--app/assets/stylesheets/application.css.scss2
-rw-r--r--app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss12
-rw-r--r--config/application.rb14
5 files changed, 97 insertions, 101 deletions
diff --git a/Gemfile b/Gemfile
index d505227..c3d86f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.2'
+gem 'rails', '3.2.9'
gem 'bcrypt-ruby'
gem 'sqlite3'
gem 'mysql2'
@@ -23,7 +23,7 @@ gem "nokogiri"
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', '~> 3.2.3'
+ gem 'sass-rails'
gem 'coffee-rails', '~> 3.2.1'
gem 'compass-rails'
gem 'uglifier', '>= 1.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 77d09fe..dd98f2d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,176 +1,178 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ actionmailer (3.2.9)
+ actionpack (= 3.2.9)
+ mail (~> 2.4.4)
+ actionpack (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ activerecord (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
+ activeresource (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
+ activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
- acts_as_list (0.1.5)
- addressable (2.2.7)
+ acts_as_list (0.1.9)
+ addressable (2.3.2)
arel (3.0.2)
bcrypt-ruby (3.0.1)
- breadcrumbs_on_rails (2.2.0)
- builder (3.0.0)
+ breadcrumbs_on_rails (2.3.0)
+ builder (3.0.4)
cache_digests (0.2.0)
actionpack (>= 3.2)
- cancan (1.6.7)
- carrierwave (0.5.8)
- activesupport (~> 3.0)
- chunky_png (1.2.5)
+ cancan (1.6.8)
+ carrierwave (0.8.0)
+ activemodel (>= 3.2.0)
+ activesupport (>= 3.2.0)
+ chunky_png (1.2.7)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.2.0)
- compass (0.12.rc.1)
+ coffee-script-source (1.4.0)
+ compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
- compass-rails (1.0.0.rc.3)
- compass (~> 0.12.rc.0)
+ compass-rails (1.0.3)
+ compass (>= 0.12.2, < 0.14)
cookiejar (0.3.0)
dalli (2.6.0)
- delayed_job (3.0.1)
+ delayed_job (3.0.4)
activesupport (~> 3.0)
- delayed_job_active_record (0.3.2)
- activerecord (> 2.1.0)
- delayed_job (~> 3.0.0)
- em-http-request (1.0.1)
+ delayed_job_active_record (0.3.3)
+ activerecord (>= 2.1.0, < 4)
+ delayed_job (~> 3.0)
+ em-http-request (1.0.3)
addressable (>= 2.2.3)
cookiejar
em-socksify
eventmachine (>= 1.0.0.beta.4)
http_parser.rb (>= 0.5.3)
- em-socksify (0.1.0)
- eventmachine
+ em-socksify (0.2.1)
+ eventmachine (>= 1.0.0.beta.4)
erubis (2.7.0)
- eventmachine (1.0.0.beta.4)
+ eventmachine (1.0.0)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (2.6.4)
- activesupport (>= 2.3.9)
- factory_girl_rails (1.7.0)
- factory_girl (~> 2.6.0)
+ factory_girl (4.1.0)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (4.1.0)
+ factory_girl (~> 4.1.0)
railties (>= 3.0.0)
- faye (0.8.0)
+ faye (0.8.8)
cookiejar (>= 0.3.0)
em-http-request (>= 0.3.0)
eventmachine (>= 0.12.0)
faye-websocket (>= 0.4.0)
rack (>= 1.0.0)
yajl-ruby (>= 1.0.0)
- faye-websocket (0.4.1)
+ faye-websocket (0.4.6)
eventmachine (>= 0.12.0)
- fssm (0.2.8.1)
+ fssm (0.2.9)
haml (3.1.7)
hike (1.2.1)
- hirb (0.6.1)
+ hirb (0.7.0)
http_accept_language (1.0.2)
http_parser.rb (0.5.3)
i18n (0.6.1)
inifile (2.0.2)
- journey (1.0.3)
- jquery-rails (2.0.1)
- railties (>= 3.2.0, < 5.0)
- thor (~> 0.14)
- json (1.6.5)
+ journey (1.0.4)
+ jquery-rails (2.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.7.6)
macaddr (1.6.1)
systemu (~> 2.5.0)
- mail (2.4.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
+ mime-types (1.19)
mini_magick (3.4)
subexec (~> 0.2.1)
multi_json (1.5.0)
mysql2 (0.3.11)
- nokogiri (1.5.5)
+ nokogiri (1.5.6)
polyglot (0.3.3)
- private_pub (1.0.1)
+ private_pub (1.0.3)
faye
- rack (1.4.1)
+ rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
+ rails (3.2.9)
+ actionmailer (= 3.2.9)
+ actionpack (= 3.2.9)
+ activerecord (= 3.2.9)
+ activeresource (= 3.2.9)
+ activesupport (= 3.2.9)
bundler (~> 1.0)
- railties (= 3.2.2)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
+ railties (= 3.2.9)
+ railties (3.2.9)
+ actionpack (= 3.2.9)
+ activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
+ thor (>= 0.14.6, < 2.0)
+ rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
- sass (3.1.15)
- sass-rails (3.2.4)
+ sass (3.2.5)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
simple_form (2.0.1)
actionpack (~> 3.0)
activemodel (~> 3.0)
- sprockets (2.1.2)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
+ sqlite3 (1.3.7)
state_machine (1.1.2)
strong_parameters (0.1.6)
actionpack (~> 3.0)
activemodel (~> 3.0)
railties (~> 3.0)
- subexec (0.2.1)
- systemu (2.5.1)
- thor (0.14.6)
+ subexec (0.2.2)
+ systemu (2.5.2)
+ thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.32)
+ tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
- uuid (2.3.5)
+ uuid (2.3.6)
macaddr (~> 1.0)
- will_paginate (3.0.3)
+ will_paginate (3.0.4)
yajl-ruby (1.1.0)
PLATFORMS
@@ -200,8 +202,8 @@ DEPENDENCIES
mysql2
nokogiri
private_pub
- rails (= 3.2.2)
- sass-rails (~> 3.2.3)
+ rails (= 3.2.9)
+ sass-rails
simple_form (= 2.0.1)
sqlite3
state_machine
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 32e54f4..2aabd17 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -114,4 +114,4 @@ a.button { margin:10px 0;}
@import "app/layouts/conference";
// Compatibility.. oh jeez.
- @import "app/shared/ie"; \ No newline at end of file
+ @import "app/shared/ie";
diff --git a/app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss b/app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss
index 2e85caf..7676dc8 100644
--- a/app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss
+++ b/app/assets/stylesheets/vendor/fancy-buttons/_fancy-buttons.scss
@@ -1,9 +1,3 @@
-@import "compass/css3/gradient";
-@import "compass/css3/border-radius";
-@import "compass/css3/opacity";
-@import "compass/css3/text-shadow";
-@import "compass/css3/box-shadow";
-@import "compass/css3/background-clip";
@import "fancy-gradient";
$fb-gradient-style: glossy !default;
@@ -60,19 +54,19 @@ $fb-line-height: 1.2em !default;
@mixin fancy-button-matte($color: $fb-color, $font-size: $fb-font-size, $radius: $fb-radius, $border-width: $fb-border-width) {
@include fancy-button-structure($font-size, $radius, $border-width);
- @include fancy-button-colors-matte($color);
+ @include fancy-button-colors-matte($color);
}
@mixin fancy-button-custom($color: $fb-color, $font-size: $fb-font-size, $radius: $fb-radius, $border-width: $fb-border-width) {
@include fancy-button-structure($font-size, $radius, $border-width);
- @include fancy-button-colors-custom($color, $font-size, $radius, $border-width);
+ @include fancy-button-colors-custom($color, $font-size, $radius, $border-width);
}
@mixin fancy-button-colors-matte($color: $fb-color, $hover: 0, $active: 0) {
$fb-current-style: $fb-gradient-style;
$fb-gradient-style: matte;
@include fancy-button-colors($color, $hover, $active);
- $fb-gradient-style: $fb-current-style;
+ $fb-gradient-style: $fb-current-style;
}
@mixin fancy-button-colors-custom($color: $fb-color, $hover: 0, $active: 0) {
diff --git a/config/application.rb b/config/application.rb
index d09cf24..776cf81 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,7 +4,7 @@ require 'rails/all'
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
- Bundler.require *Rails.groups(:assets => %w(development test))
+ Bundler.require(*Rails.groups(:assets => %w(development test)))
# If you want your assets lazily compiled in production, use this line
# Bundler.require(:default, :assets, Rails.env)
end
@@ -21,19 +21,19 @@ module Gemeinschaft42c
# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named.
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
+
# --- rather use Apache + Passenger for SSL -----{
#config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
+
#config.middleware.insert_before ActionDispatch::Static, "Rack::SSL"
#config.middleware.insert_before ActionDispatch::Static, Rack::SSL, :exclude => proc { |env| env['HTTPS'] != 'on' }
#config.force_ssl = true
-
+
#require 'rack/ssl'
#config.middleware.use Rack::SSL
# -----------------------------------------------}
-
-
+
+
# Activate observers that should always be running.
# config.active_record.observers = :cacher, :garbage_collector, :forum_observer
@@ -58,7 +58,7 @@ module Gemeinschaft42c
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
-
+
# Load the PhoneControllers
config.autoload_paths += %W(#{config.root}/lib/phone_controllers)
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 09:53:09 +0000