Skip to content

R
rendezvous
Commit 1e92221c by tady
Options

fix devise routing

parent 41769eee
Showing with 55 additions and 52 deletions
Gemfile.lock
...@@ -18,27 +18,27 @@ GIT ...@@ -18,27 +18,27 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.0.rc2) actionmailer (4.1.0)
actionpack (= 4.1.0.rc2) actionpack (= 4.1.0)
actionview (= 4.1.0.rc2) actionview (= 4.1.0)
mail (~> 2.5.4) mail (~> 2.5.4)
actionpack (4.1.0.rc2) actionpack (4.1.0)
actionview (= 4.1.0.rc2) actionview (= 4.1.0)
activesupport (= 4.1.0.rc2) activesupport (= 4.1.0)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.0.rc2) actionview (4.1.0)
activesupport (= 4.1.0.rc2) activesupport (= 4.1.0)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.0.rc2) activemodel (4.1.0)
activesupport (= 4.1.0.rc2) activesupport (= 4.1.0)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.0.rc2) activerecord (4.1.0)
activemodel (= 4.1.0.rc2) activemodel (= 4.1.0)
activesupport (= 4.1.0.rc2) activesupport (= 4.1.0)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.0.rc2) activesupport (4.1.0)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
...@@ -90,10 +90,10 @@ GEM ...@@ -90,10 +90,10 @@ GEM
coffee-rails (4.0.1) coffee-rails (4.0.1)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0) coffee-script (2.3.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.7.0) coffee-script-source (1.7.1)
colorize (0.7.3) colorize (0.7.3)
coveralls (0.7.0) coveralls (0.7.0)
multi_json (~> 1.3) multi_json (~> 1.3)
...@@ -112,9 +112,6 @@ GEM ...@@ -112,9 +112,6 @@ GEM
railties (>= 3.2.6, < 5) railties (>= 3.2.6, < 5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
devise-better_routes (0.0.4)
devise (>= 3.0.0.rc)
rails (>= 4.0.0.rc1)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
domain_name (0.5.19) domain_name (0.5.19)
...@@ -153,10 +150,10 @@ GEM ...@@ -153,10 +150,10 @@ GEM
guard-rubocop (1.1.0) guard-rubocop (1.1.0)
guard (~> 2.0) guard (~> 2.0)
rubocop (~> 0.20) rubocop (~> 0.20)
guard-teaspoon (0.0.4) guard-teaspoon (0.8.0)
guard (>= 1.6.1) guard (~> 2.2)
teaspoon (>= 0.5.3) teaspoon (>= 0.8.0)
hashie (3.1.0) hashie (3.2.0)
hike (1.2.3) hike (1.2.3)
htmlentities (4.3.2) htmlentities (4.3.2)
http-cookie (1.0.2) http-cookie (1.0.2)
...@@ -165,7 +162,7 @@ GEM ...@@ -165,7 +162,7 @@ GEM
i18n_generators (1.2.1) i18n_generators (1.2.1)
mechanize mechanize
rails (>= 3.0.0) rails (>= 3.0.0)
jbuilder (2.1.2) jbuilder (2.1.3)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-rails (3.1.1) jquery-rails (3.1.1)
...@@ -258,19 +255,19 @@ GEM ...@@ -258,19 +255,19 @@ GEM
rack (>= 1.1.3) rack (>= 1.1.3)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.0.rc2) rails (4.1.0)
actionmailer (= 4.1.0.rc2) actionmailer (= 4.1.0)
actionpack (= 4.1.0.rc2) actionpack (= 4.1.0)
actionview (= 4.1.0.rc2) actionview (= 4.1.0)
activemodel (= 4.1.0.rc2) activemodel (= 4.1.0)
activerecord (= 4.1.0.rc2) activerecord (= 4.1.0)
activesupport (= 4.1.0.rc2) activesupport (= 4.1.0)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.0.rc2) railties (= 4.1.0)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0)
railties (4.1.0.rc2) railties (4.1.0)
actionpack (= 4.1.0.rc2) actionpack (= 4.1.0)
activesupport (= 4.1.0.rc2) activesupport (= 4.1.0)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
...@@ -281,8 +278,8 @@ GEM ...@@ -281,8 +278,8 @@ GEM
rdoc (4.1.1) rdoc (4.1.1)
json (~> 1.4) json (~> 1.4)
ref (1.0.5) ref (1.0.5)
request_store (1.0.6) request_store (1.0.7)
rest-client (1.7.1) rest-client (1.7.2)
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
netrc (~> 0.7) netrc (~> 0.7)
rspec (3.0.0) rspec (3.0.0)
...@@ -312,16 +309,17 @@ GEM ...@@ -312,16 +309,17 @@ GEM
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
ruby-progressbar (1.5.1) ruby-progressbar (1.5.1)
sass (3.3.9) sass (3.2.19)
sass-rails (4.0.1) sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10) sass (~> 3.2.0)
sprockets-rails (~> 2.0.0) sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
sdoc (0.4.0) sdoc (0.4.0)
json (~> 1.8) json (~> 1.8)
rdoc (~> 4.0, < 5.0) rdoc (~> 4.0, < 5.0)
settingslogic (2.0.9) settingslogic (2.0.9)
simplecov (0.8.2) simplecov (0.9.0)
docile (~> 1.1.0) docile (~> 1.1.0)
multi_json multi_json
simplecov-html (~> 0.8.0) simplecov-html (~> 0.8.0)
...@@ -329,13 +327,13 @@ GEM ...@@ -329,13 +327,13 @@ GEM
slim (2.0.3) slim (2.0.3)
temple (~> 0.6.6) temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slop (3.5.0) slop (3.6.0)
sprockets (2.12.1) sprockets (2.11.0)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1) sprockets-rails (2.1.3)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (~> 2.8)
...@@ -363,12 +361,12 @@ GEM ...@@ -363,12 +361,12 @@ GEM
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
turnip (1.2.1) turnip (1.2.2)
gherkin (>= 2.5) gherkin (>= 2.5)
rspec (>= 2.0, < 4.0) rspec (>= 2.0, < 4.0)
tzinfo (1.2.1) tzinfo (1.2.1)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.1) uglifier (2.5.3)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
unf (0.1.4) unf (0.1.4)
...@@ -403,7 +401,6 @@ DEPENDENCIES ...@@ -403,7 +401,6 @@ DEPENDENCIES
coveralls coveralls
database_rewinder database_rewinder
devise devise
devise-better_routes
draper (~> 1.3) draper (~> 1.3)
factory_girl_rails factory_girl_rails
faraday faraday
...@@ -427,7 +424,7 @@ DEPENDENCIES ...@@ -427,7 +424,7 @@ DEPENDENCIES
premailer premailer
pry-rails pry-rails
rack-mini-profiler rack-mini-profiler
rails (~> 4) rails (~> 4.1)
rspec-rails rspec-rails
rubocop rubocop
sass-rails sass-rails
......
app/views/partials/_app_header.html.slim
...@@ -37,10 +37,10 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation" ...@@ -37,10 +37,10 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation"
| 下書き | 下書き
span.badge.pull-right = current_user.decorate.draft_count span.badge.pull-right = current_user.decorate.draft_count
li li
a href=edit_me_path マイページ a href=edit_user_registration_path マイページ
li.divider li.divider
li li
a href=me_session_path data-method="delete" rel="nofollow" SignOut a href=destroy_user_session_path data-method="delete" rel="nofollow" SignOut
li.dropdown li.dropdown
a.dropdown-toggle data-toggle="dropdown" a.dropdown-toggle data-toggle="dropdown"
| 通知 | 通知
......
config/settings.yml.example
...@@ -4,10 +4,16 @@ ...@@ -4,10 +4,16 @@
defaults: &defaults defaults: &defaults
rendezvous: rendezvous:
# For amil body
app_host: "http://rendezvous.dev" app_host: "http://rendezvous.dev"
# For login
google_api: google_api:
client_id: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.apps.googleusercontent.com" client_id: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.apps.googleusercontent.com"
secret: "xxxxxxxxxxxxxxxxxxxxxxxxxxxx" secret: "xxxxxxxxxxxxxxxxxxxxxxxxxxxx"
# For file upload
s3: s3:
access_key_id: "xxxxxxxxxxxxxxxxxxxxx" access_key_id: "xxxxxxxxxxxxxxxxxxxxx"
secret_access_key: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" secret_access_key: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment