Merge branch 'wip/1230_views'
Conflicts: Gemfile.lock
Showing
.coveralls.yml
0 → 100644
.rspec
0 → 100644
.rubocop.yml
0 → 100644
.travis.yml
0 → 100644
| ... | @@ -6,13 +6,15 @@ ruby '2.0.0' | ... | @@ -6,13 +6,15 @@ ruby '2.0.0' |
| gem 'rails', '~> 4.0.2' | gem 'rails', '~> 4.0.2' | ||
| # Use SCSS for stylesheets | # Use SCSS for stylesheets | ||
| gem 'sass-rails', '~> 4.0.0' | gem 'sass-rails' | ||
| # Use Uglifier as compressor for JavaScript assets | # Use Uglifier as compressor for JavaScript assets | ||
| gem 'uglifier', '>= 1.3.0' | gem 'uglifier' | ||
| # Use CoffeeScript for .js.coffee assets and views | # Use CoffeeScript for .js.coffee assets and views | ||
| gem 'coffee-rails', '~> 4.0.0' | gem 'coffee-rails' | ||
| gem 'jquery-rails' | |||
| # See https://github.com/sstephenson/execjs#readme for more supported runtimes | # See https://github.com/sstephenson/execjs#readme for more supported runtimes | ||
| # gem 'therubyracer', platforms: :ruby | # gem 'therubyracer', platforms: :ruby | ||
| ... | @@ -24,7 +26,9 @@ gem 'coffee-rails', '~> 4.0.0' | ... | @@ -24,7 +26,9 @@ gem 'coffee-rails', '~> 4.0.0' |
| # gem 'turbolinks' | # gem 'turbolinks' | ||
| # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder | # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder | ||
| gem 'jbuilder', '~> 1.2' | gem 'jbuilder' | ||
| gem 'i18n_generators' | |||
| group :doc do | group :doc do | ||
| # bundle exec rake doc:rails generates the API under doc/api. | # bundle exec rake doc:rails generates the API under doc/api. | ||
| ... | @@ -45,6 +49,9 @@ end | ... | @@ -45,6 +49,9 @@ end |
| # gem 'bootstrap-sass-rails' | # gem 'bootstrap-sass-rails' | ||
| gem 'mysql2' | |||
| gem 'sqlite3' | |||
| gem 'devise' | gem 'devise' | ||
| gem 'omniauth-google-oauth2' | gem 'omniauth-google-oauth2' | ||
| ... | @@ -57,19 +64,39 @@ gem 'coderay' | ... | @@ -57,19 +64,39 @@ gem 'coderay' |
| group :development do | group :development do | ||
| # Use sqlite3 as the database for Active Record | # Use sqlite3 as the database for Active Record | ||
| gem 'sqlite3' | |||
| gem 'better_errors' | gem 'better_errors' | ||
| gem 'binding_of_caller' | gem 'binding_of_caller' | ||
| gem 'thin' | gem 'thin' | ||
| # gem 'capistrano', '~> 3.0.1' | # gem 'capistrano', '~> 3.0.1' | ||
| gem 'pry-rails' | |||
| # profiler | |||
| gem 'rack-mini-profiler' | |||
| # rubocop | |||
| gem 'rubocop' | |||
| gem 'guard-rubocop' | |||
| gem 'guard-rspec' | |||
| gem 'guard-spring' | |||
| gem 'spring' | |||
| end | end | ||
| group :production do | group :development, :test do | ||
| gem 'rails_12factor' | gem 'rspec-rails' | ||
| gem 'pg' | |||
| # gem 'database_cleaner' | |||
| gem 'database_rewinder' | |||
| end | |||
| group :test do | |||
| gem 'factory_girl_rails' | |||
| gem 'capybara' | |||
| gem 'launchy' | |||
| gem 'poltergeist' | |||
| gem 'coveralls', :require => false | |||
| end | end | ||
| group :development, :test do | group :development, :test do | ||
| ... | @@ -79,8 +106,16 @@ end | ... | @@ -79,8 +106,16 @@ end |
| # tree structure | # tree structure | ||
| gem 'ancestry' | gem 'ancestry' | ||
| # profiler | # Send mail via gmail oauth | ||
| gem 'rack-mini-profiler' | # ref. https://github.com/popgiro/action-gmailer | ||
| gem 'mail' | |||
| gem 'action-gmailer', github: 'popgiro/action-gmailer' | |||
| # compose html mail | |||
| gem 'nokogiri' | |||
| gem 'premailer' | |||
| gem 'faraday' | |||
| # Google smtp | # Check mail format | ||
| gem 'gmail_xoauth' | gem 'validates_email_format_of' |
Guardfile
0 → 100644
app/assets/stylesheets/body-padding.css.scss
0 → 100644
app/controllers/concerns/rv/mailer.rb
0 → 100644
app/helpers/style_helper.rb
0 → 100644
bin/spring
0 → 100755
bin/sqlite3-to-mysql.py
0 → 100644
config/locales/ja.yml
0 → 100644
config/locales/translation_ja.yml
0 → 100644
spec/controllers/concerns/rv/mailer_spec.rb
0 → 100644
spec/controllers/home_controller_spec.rb
0 → 100644
spec/factories/posts.rb
0 → 100644
spec/factories/tags.rb
0 → 100644
spec/factories/users.rb
0 → 100644
spec/features/posts_spec.rb
0 → 100644
spec/models/post_spec.rb
0 → 100644
spec/models/tag_spec.rb
0 → 100644
spec/models/user_spec.rb
0 → 100644
spec/spec_helper.rb
0 → 100644
spec/support/devise.rb
0 → 100644
test/controllers/.keep
deleted
100644 → 0
test/fixtures/.keep
deleted
100644 → 0
test/fixtures/posts.yml
deleted
100644 → 0
test/fixtures/tags.yml
deleted
100644 → 0
test/fixtures/users.yml
deleted
100644 → 0
test/helpers/.keep
deleted
100644 → 0
test/helpers/home_helper_test.rb
deleted
100644 → 0
test/helpers/posts_helper_test.rb
deleted
100644 → 0
test/integration/.keep
deleted
100644 → 0
test/mailers/.keep
deleted
100644 → 0
test/models/.keep
deleted
100644 → 0
test/models/post_test.rb
deleted
100644 → 0
test/models/tag_test.rb
deleted
100644 → 0
test/models/user_test.rb
deleted
100644 → 0
test/test_helper.rb
deleted
100644 → 0
Please
register
or
sign in
to comment