Merge pull request #867 from NARKOZ/refactoring
Refactoring and assets cleanup
Showing
... | @@ -4,19 +4,16 @@ gem "rails", "3.2.3" | ... | @@ -4,19 +4,16 @@ gem "rails", "3.2.3" |
gem "sqlite3" | gem "sqlite3" | ||
gem "mysql2" | gem "mysql2" | ||
gem "rake" | |||
gem "devise", "~> 1.5" | gem "devise", "~> 1.5" | ||
gem "stamp" | gem "stamp" | ||
gem "kaminari" | gem "kaminari" | ||
gem "haml", "3.1.4" | |||
gem "haml-rails" | gem "haml-rails" | ||
gem "jquery-rails" | gem "jquery-rails" | ||
gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "810e3c11787e9d84c5925a7edc3264db0f04bb49" | gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "810e3c11787e9d84c5925a7edc3264db0f04bb49" | ||
gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0" | gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0" | ||
gem "carrierwave" | gem "carrierwave" | ||
gem "six" | gem "six" | ||
gem "therubyracer" | gem "ffaker" | ||
gem "faker" | |||
gem "seed-fu" | gem "seed-fu" | ||
gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" | gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" | ||
gem "pygments.rb", "0.2.12", :git => "https://github.com/gitlabhq/pygments.rb.git" | gem "pygments.rb", "0.2.12", :git => "https://github.com/gitlabhq/pygments.rb.git" | ||
... | @@ -37,11 +34,16 @@ gem "colored" | ... | @@ -37,11 +34,16 @@ gem "colored" |
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" | gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" | ||
gem 'modularity' | gem 'modularity' | ||
gem 'resque_mailer' | gem 'resque_mailer' | ||
gem 'chosen-rails' | |||
gem 'modernizr' | |||
gem 'graphael-rails' | |||
gem 'jquery-ui-rails' | |||
group :assets do | group :assets do | ||
gem "sass-rails", "3.2.3" | gem "sass-rails", "3.2.3" | ||
gem "coffee-rails", "3.2.2" | gem "coffee-rails", "3.2.2" | ||
gem "uglifier", "1.0.3" | gem "uglifier", "1.0.3" | ||
gem "therubyracer" | |||
end | end | ||
group :development do | group :development do | ||
... | ... |
File moved
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
File moved
This source diff could not be displayed because it is too large. You can view the blob instead.
655 Bytes
455 Bytes
537 Bytes
777 Bytes
641 Bytes
45.8 KB
691 Bytes
741 Bytes
749 Bytes
591 Bytes
45.9 KB
663 Bytes
195 Bytes