Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2017년 투표대잔치 #3

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
bb0f24c
update ruby version
wagurano Jan 9, 2016
9347edd
rename README
wagurano Jan 9, 2016
abd0765
update gems
wagurano Jan 9, 2016
862c3fa
add bootstrap files
wagurano Jan 9, 2016
63ed5f1
update route
wagurano Jan 9, 2016
5ac7dba
update image_uploader
wagurano Jan 9, 2016
5b747c7
update development
wagurano Jan 9, 2016
5538a70
update twitter
wagurano Jan 9, 2016
efe2989
update devise
wagurano Jan 9, 2016
3cfc4d3
update application
wagurano Jan 9, 2016
98992e3
update models
wagurano Jan 9, 2016
2c171b8
update gems and fix typos
wagurano Jan 10, 2016
3f2e273
commented out for mongoid
wagurano Mar 26, 2016
7931e57
add docker files
wagurano Apr 7, 2016
011ffbb
Update config files and Remove credentials and Add mongoid.yml and Up…
wagurano Apr 29, 2017
0845e2c
Update image upload
wagurano Apr 30, 2017
df63029
Add ruby version to Gemfile
wagurano Apr 30, 2017
68d7595
Update mongoid.yml
wagurano Apr 30, 2017
a079b33
Update Gemfile and ruby version
wagurano May 3, 2017
910d6a0
Add config/deploy/
wagurano May 3, 2017
2e938b6
Remove docker-compose.yml
wagurano May 3, 2017
a7ffd84
Update README.md
wagurano May 3, 2017
b3cb0ab
Remove mongoid.yml
wagurano May 3, 2017
4f24ab0
Update deploy.rb
wagurano May 5, 2017
bff6ec5
Add 2012 version
wagurano May 5, 2017
56df1b6
Add diagrams
wagurano May 5, 2017
a6f3b39
Update locale file
wagurano May 5, 2017
a2cf2b2
Update controller, helper, layout in application and y2012
wagurano May 5, 2017
d4d1500
Update page, promise, award, vote
wagurano May 5, 2017
d5d7d00
Update deploy
wagurano May 8, 2017
df51f47
Update user view
wagurano May 8, 2017
27c4399
Update encourage box
wagurano May 8, 2017
6ea35a4
Add countdown
wagurano May 8, 2017
2597bd6
Update user#show and vote#assign_id and carrier wave
wagurano May 9, 2017
b49318f
Update application.html.er
wagurano May 9, 2017
228ded8
Update awards, promises, votes controller
wagurano May 9, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update application.html.er
sign in with facebook failed, need to fix it
  • Loading branch information
wagurano committed May 9, 2017
commit b49318f650be0ae35a2292b0e81a21844a536120
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@
<b class='caret'></b>
</a>
<ul class='dropdown-menu'>
<li><%= link_to t('g.sign_with_facebook'), user_facebook_omniauth_authorize_path %></li>
<!-- <li><%= link_to t('g.sign_with_facebook'), user_facebook_omniauth_authorize_path %></li> -->
<li><%= link_to t('g.sign_with_twitter'), user_twitter_omniauth_authorize_path %></li>
</li>
<% end %>
4 changes: 2 additions & 2 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -37,6 +37,6 @@
root to: 'pages#home'
end

# root to: 'pages#home'
root to: 'pages#count'
root to: 'pages#home'
# root to: 'pages#count'
end