Merge branch 'dev'
Conflicts: app/assets/images/ajax-loader.gif public/favicon.ico
Showing
... | @@ -5,7 +5,7 @@ gem 'rails', '3.1.0' | ... | @@ -5,7 +5,7 @@ gem 'rails', '3.1.0' |
gem 'sqlite3' | gem 'sqlite3' | ||
gem 'devise', "1.4.7" | gem 'devise', "1.4.7" | ||
gem 'stamp' | gem 'stamp' | ||
gem 'will_paginate', '~> 3.0' | gem 'kaminari' | ||
gem 'haml-rails' | gem 'haml-rails' | ||
gem 'jquery-rails' | gem 'jquery-rails' | ||
gem 'grit', :git => 'git://github.com/gitlabhq/grit.git' | gem 'grit', :git => 'git://github.com/gitlabhq/grit.git' | ||
... | @@ -16,10 +16,12 @@ gem 'faker' | ... | @@ -16,10 +16,12 @@ gem 'faker' |
gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git' | gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git' | ||
gem "inifile" | gem "inifile" | ||
gem "pygments.rb", "0.2.3" | gem "pygments.rb", "0.2.3" | ||
gem "kaminari" | |||
gem "thin" | gem "thin" | ||
gem "git" | gem "git" | ||
gem "acts_as_list" | gem "acts_as_list" | ||
gem 'rdiscount' | |||
gem 'acts-as-taggable-on', '~>2.1.0' | |||
group :assets do | group :assets do | ||
gem 'sass-rails', " ~> 3.1.0" | gem 'sass-rails', " ~> 3.1.0" | ||
... | @@ -28,13 +30,14 @@ group :assets do | ... | @@ -28,13 +30,14 @@ group :assets do |
end | end | ||
group :development do | group :development do | ||
gem 'letter_opener' | |||
gem 'rails-footnotes', '>= 3.7.5.rc4' | gem 'rails-footnotes', '>= 3.7.5.rc4' | ||
gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' | gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' | ||
end | end | ||
group :development, :test do | group :development, :test do | ||
gem 'rspec-rails' | gem 'rspec-rails' | ||
gem 'shoulda' | gem "shoulda", "~> 3.0.0.beta2" | ||
gem 'capybara' | gem 'capybara' | ||
gem 'autotest' | gem 'autotest' | ||
gem 'autotest-rails' | gem 'autotest-rails' | ||
... | ... |
212 Bytes
396 Bytes
422 Bytes
app/assets/images/images.png
0 → 100644
8.49 KB
1.4 KB
1.01 KB
640 Bytes
747 Bytes
640 Bytes
public/apple-touch-icon.png
0 → 100755
640 Bytes
spec/requests/tags_spec.rb
0 → 100644
180 Bytes
178 Bytes
120 Bytes
105 Bytes
111 Bytes
110 Bytes
119 Bytes
101 Bytes
4.27 KB
5.23 KB
4.27 KB
4.27 KB
4.27 KB
This source diff could not be displayed because it is too large. You can view the blob instead.