Permalink
Browse files

Merge branch 'rails4'

  • Loading branch information...
reyesyang committed Dec 23, 2013
2 parents 6326570 + 39c738a commit 1b31aabb41b26484298f1e2a7cedcb6f8b7e8f1c
Showing with 1,777 additions and 859 deletions.
  1. +2 −0 .rspec
  2. +34 −23 Gemfile
  3. +163 −153 Gemfile.lock
  4. +1 −1 app/assets/javascripts/application.js
  5. +0 −66 app/assets/javascripts/jquery.autogrowtextarea.js
  6. +34 −0 app/assets/javascripts/persona.js.coffee
  7. +2 −1 app/assets/javascripts/wmd-editor.js
  8. +1 −0 app/assets/stylesheets/application.css
  9. +7 −2 app/assets/stylesheets/global.scss
  10. +8 −7 app/controllers/application_controller.rb
  11. +40 −45 app/controllers/articles_controller.rb
  12. +28 −21 app/controllers/sessions_controller.rb
  13. +0 −27 app/controllers/tags_controller.rb
  14. +0 −84 app/controllers/users_controller.rb
  15. +7 −15 app/helpers/application_helper.rb
  16. +0 −23 app/models/ability.rb
  17. +16 −54 app/models/article.rb
  18. +0 −4 app/models/authorization.rb
  19. +6 −5 app/models/tag.rb
  20. +5 −0 app/models/tagging.rb
  21. +5 −6 app/models/user.rb
  22. +3 −3 app/views/articles/_article.html.haml
  23. +2 −2 app/views/articles/_form.html.haml
  24. +1 −1 app/views/articles/index.html.haml
  25. +5 −4 app/views/articles/show.html.haml
  26. +8 −4 app/views/layouts/_aside.html.haml
  27. +5 −2 app/views/layouts/application.html.haml
  28. +3 −10 config/app_config.example.yml
  29. +17 −3 config/application.rb
  30. +4 −8 config/environments/development.rb
  31. +32 −12 config/environments/production.rb
  32. +8 −7 config/environments/test.rb
  33. +0 −7 config/initializers/omniauth.rb
  34. +6 −1 config/initializers/secret_token.rb
  35. +1 −1 config/locales/{zh_CN.yml → zh-CN.yml}
  36. +4 −4 config/routes.rb
  37. +5 −0 db/migrate/20131218154845_rename_articles_tags_to_taggings.rb
  38. +22 −0 db/migrate/20131218155347_add_timestamps_to_taggings.rb
  39. +31 −29 db/schema.rb
  40. +61 −0 lib/assets/javascripts/jquery.autogrowtextarea.js
  41. +114 −0 lib/assets/javascripts/jquery.cookie.js
  42. +206 −0 lib/assets/javascripts/stubbyid.js
  43. +228 −0 lib/assets/stylesheets/persona-buttons.css
  44. +328 −0 spec/controllers/articles_controller_spec.rb
  45. +9 −0 spec/factories/articles.rb
  46. +72 −0 spec/features/articles_spec.rb
  47. +12 −0 spec/features/persona_spec.rb
  48. +128 −0 spec/models/article_spec.rb
  49. +12 −0 spec/models/user_spec.rb
  50. +61 −0 spec/spec_helper.rb
  51. +30 −0 spec/support/persona_macros.rb
  52. +0 −9 test/factories/authorizations.rb
  53. +0 −10 test/factories/users.rb
  54. +0 −55 test/functional/articles_controller_test.rb
  55. +0 −7 test/functional/sessions_controller_test.rb
  56. +0 −9 test/functional/tags_controller_test.rb
  57. +0 −58 test/functional/users_controller_test.rb
  58. +0 −10 test/performance/browsing_test.rb
  59. +0 −22 test/test_helper.rb
  60. +0 −12 test/unit/article_test.rb
  61. +0 −7 test/unit/authorization_test.rb
  62. +0 −4 test/unit/helpers/sessions_helper_test.rb
  63. +0 −9 test/unit/tag_test.rb
  64. +0 −12 test/unit/user_test.rb
View
2 .rspec
@@ -0,0 +1,2 @@
+--color
+--format documentation
View
57 Gemfile
@@ -1,26 +1,34 @@
-source 'http://rubygems.org'
+source 'http://ruby.taobao.org'
+ruby "2.0.0"
-gem 'rails', '~> 3.2.1'
+gem 'rails', '~> 4.0.0'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'mysql2'
-gem 'json'
-
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails'
- gem 'coffee-rails'
- gem 'uglifier'
+ gem 'sass-rails', '~> 4.0.0'
+ gem 'coffee-rails', '~> 4.0.0'
+
+ # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+ gem 'therubyracer', platforms: :ruby
+
+ gem 'uglifier', '>= 1.0.3'
end
gem 'jquery-rails'
+
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 1.5.1'
+
gem 'execjs'
-gem 'therubyracer'
-gem 'client_side_validations'
gem 'twitter-bootstrap-rails'
gem 'less-rails'
# gem "acts_as_ferret", :git => "https://github.com/jkraemer/acts_as_ferret.git"
@@ -30,21 +38,11 @@ gem 'will_paginate', '>=3.0.pre'
# gem 'bootstrap-will_paginate'
gem 'wmd-rails'
gem 'redcarpet'
-gem 'haml'
-
-# third party login
-gem 'omniauth'
-gem 'omniauth-google-oauth2'
-gem 'omniauth-twitter'
-gem 'omniauth-github'
-gem 'omniauth-xiaonei'
-gem 'omniauth-douban-oauth2'
-
-# permission control
-gem "cancan"
+gem "haml"
+gem 'rails-i18n', '~>4.0.0'
# To use ActiveModel has_secure_password
-gem 'bcrypt-ruby', '~> 3.0.0'
+# gem 'bcrypt-ruby', '~> 3.1.0'
# Use unicorn as the web server
# gem 'unicorn'
@@ -57,6 +55,19 @@ gem 'rvm-capistrano'
# gem 'ruby-debug'
group :development, :test do
- gem 'factory_girl_rails'
+ gem 'quiet_assets'
gem 'pry-rails'
+
+ gem 'rspec-rails'
+ gem 'factory_girl_rails'
+end
+
+group :test do
+ gem "fakeweb"
+ gem "shoulda-matchers"
+ gem "capybara"
+ gem "capybara-webkit"
+ gem "selenium-webdriver"
+ gem "launchy"
+ gem "database_cleaner"
end
Oops, something went wrong.

0 comments on commit 1b31aab

Please sign in to comment.