bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:fetsite/fetsite

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Andreas Stephanides
2014-02-23 14:30:26 +01:00
parent aa2ef0955c 14b42ef33a
commit 28dd49bbee
5 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,4 +1,8 @@
/usergroup.ldif
/newuser.ldif
/passwd.ldif
/config/omniauth_secrets.yml
/config/database.yml
/config/initializers/omniauth_secrets.rb
# See http://help.github.com/ignore-files/ for more about ignoring files.
#

4
Gemfile
View File

@@ -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'

69
Gemfile.lock
View File

@@ -15,32 +15,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)
@@ -102,7 +102,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)
@@ -112,17 +112,16 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.1.1)
railties (>= 3.1.0)
json (1.7.7)
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)
@@ -163,17 +162,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)
@@ -207,7 +206,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)
@@ -261,8 +260,7 @@ DEPENDENCIES
omniauth-ldap
paper_trail (>= 2.7.0)!
paperclip (~> 3.4.0)
rails (= 3.2.9)
remotipart!
rails (= 3.2.13)
rmagick
rolify
rspec-rails
@@ -270,6 +268,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

2
config/environments/production.rb
View File

@@ -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