Merge remote-tracking branch 'upstream/master'
Showing
.rbenv-version
deleted
100644 → 0
source "http://rubygems.org" | source "http://rubygems.org" | ||
gem "rails", "3.1.1" | gem "rails", "3.2.1" | ||
gem "sqlite3" | gem "sqlite3" | ||
gem "rake", "0.9.2.2" | gem "rake" | ||
gem "devise", "1.5.0" | gem "devise" | ||
gem "stamp" | gem "stamp" | ||
gem "kaminari" | gem "kaminari" | ||
gem "haml", "3.1.4" | gem "haml", "3.1.4" | ||
... | @@ -16,7 +16,7 @@ gem "carrierwave" | ... | @@ -16,7 +16,7 @@ gem "carrierwave" |
gem "six" | gem "six" | ||
gem "therubyracer" | gem "therubyracer" | ||
gem "faker" | gem "faker" | ||
gem "seed-fu", "~> 2.1.0" | gem "seed-fu" | ||
gem "pygments.rb", "0.2.4" | gem "pygments.rb", "0.2.4" | ||
gem "thin" | gem "thin" | ||
gem "git" | gem "git" | ||
... | @@ -24,20 +24,23 @@ gem "acts_as_list" | ... | @@ -24,20 +24,23 @@ gem "acts_as_list" |
gem "rdiscount" | gem "rdiscount" | ||
gem "acts-as-taggable-on", "~> 2.1.0" | gem "acts-as-taggable-on", "~> 2.1.0" | ||
gem "drapper" | gem "drapper" | ||
gem "resque" | gem "resque", "~> 1.20.0" | ||
gem "httparty" | gem "httparty" | ||
gem "charlock_holmes" | gem "charlock_holmes" | ||
gem "foreman" | gem "foreman" | ||
gem "omniauth-ldap" | |||
gem 'bootstrap-sass', "1.4.4" | |||
gem "colored" | |||
group :assets do | group :assets do | ||
gem "sass-rails", "~> 3.1.0" | gem "sass-rails", "3.2.3" | ||
gem "coffee-rails", "~> 3.1.0" | gem "coffee-rails", "3.2.1" | ||
gem "uglifier" | gem "uglifier", "1.0.3" | ||
end | end | ||
group :development do | group :development do | ||
gem "letter_opener" | gem "letter_opener" | ||
gem "rails-footnotes", "~> 3.7.5" | gem "rails-footnotes" | ||
gem "annotate", :git => "https://github.com/ctran/annotate_models.git" | gem "annotate", :git => "https://github.com/ctran/annotate_models.git" | ||
end | end | ||
... | @@ -46,9 +49,7 @@ group :development, :test do | ... | @@ -46,9 +49,7 @@ group :development, :test do |
gem "capybara" | gem "capybara" | ||
gem "autotest" | gem "autotest" | ||
gem "autotest-rails" | gem "autotest-rails" | ||
unless ENV["CI"] | gem "pry" | ||
gem "ruby-debug19", :require => "ruby-debug" | |||
end | |||
gem "awesome_print" | gem "awesome_print" | ||
gem "database_cleaner" | gem "database_cleaner" | ||
gem "launchy" | gem "launchy" | ||
... | @@ -58,5 +59,5 @@ end | ... | @@ -58,5 +59,5 @@ end |
group :test do | group :test do | ||
gem "turn", :require => false | gem "turn", :require => false | ||
gem "simplecov", :require => false | gem "simplecov", :require => false | ||
gem "shoulda", "~> 3.0.0.beta2" | gem "shoulda", "3.0.0" | ||
end | end |
940 Bytes
782 Bytes
| W: | H:
| W: | H:
app/assets/images/admin.PNG
0 → 100644
556 Bytes
| W: | H:
| W: | H:
| W: | H:
| W: | H:
1.16 KB
95.7 KB
54.5 KB
596 Bytes
7.71 KB
641 Bytes
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
app/helpers/wikis_helper.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
app/models/event.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
app/models/wiki.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/tasks/update_hooks.rake
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
public/static.css
0 → 100644
This diff is collapsed.
This diff is collapsed.
resque_dev.sh
0 → 100755
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/models/event_spec.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/requests/wikis_spec.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.