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.

Sign up for GitHub

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

Jump to bottom

Google login #2826

Merged
merged 40 commits into from
Jun 13, 2018
Merged

Google login #2826

merged 40 commits into from
Jun 13, 2018

Conversation

SidharthBansal
Copy link
Member

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • PR body includes fixes #0000-style reference to original issue #
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays.

Thanks!

SidharthBansal and others added 30 commits June 6, 2018 00:15
@SidharthBansal
Routes modified
14eff99
@SidharthBansal
Set the views
307c2a2
@SidharthBansal
Modified error messages and user_tag
6cbf83c
@SidharthBansal
Add User_Tag as identity and find user_tag
5bea168
@devamaz @jywarren
Reformat range stats page to table (publiclab#2792)
ac1b483
@KirbyBrown @jywarren
Index page listing for UserTags per issue publiclab#2741. (publiclab#…
7e63d5f 
…2753)

* Index page listing for UserTags per issue publiclab#2741.

* Changes per pull request checks.

* Removed debugging line.

* Added routes to reflect 'groups' naming convention for user_tags per pull request spec.

* Tests rewritten after rebase.

* Index page listing for UserTags per issue publiclab#2741.

* Changes per pull request checks.

* Removed debugging line.

* Added routes to reflect 'groups' naming convention for user_tags per pull request spec.

* Fix for test of sort by value.
@jywarren
Update routes.rb for wiki update (publiclab#2804)
6e6ccbd 
* Update routes.rb

* fixes
@SidharthBansal
User_sessions_controller modified
5d145b7
@SidharthBansal
User_tag modified
626555d
@SidharthBansal
user session controller modified
420f94f
@SidharthBansal
Checkpoint 1
b8a1413
@SidharthBansal
checkpoint1 codeclimate errors fixed
cd83f92
@jywarren
integration tests for assets (publiclab#2806)
2cbd203 
* integration tests for assets

* full assets included

* Update assets.rb
@SidharthBansal
Checkpoint 2
ad729e3
@Souravirus @jywarren
Added routes to notes/edit (publiclab#2808)
cb48bc9 
* Added routes to notes/edit

* Removed redundant notes#edit and added get instead of post in edit actions
@jywarren
Update routes.rb (publiclab#2810)
cac7257
@jywarren
Create OPENID.md
5e30fbe
@Souravirus @jywarren
fixing error in home_controller related to group by (publiclab#2794)
b971b53 
* Added group by note.nid

* correction
@jywarren
Openid fix with post route and better alert texts (publiclab#2815)
b4728ff 
* Added group by note.nid

* correction

* reworded openid requests and added post method for 2nd step

* adjust message

* Update openid_test.rb

* Update openid_test.rb

* Update openid_test.rb

* Update openid_test.rb
@jywarren
Update Dangerfile (publiclab#2816)
8b65e69
@jywarren
Update routes.rb to fix embeddable features (publiclab#2818)
75c7553 
* Update routes.rb

* Removed the apostrophe mismatch

* Added tests for embed in feature
@jywarren
Delete route for notes (publiclab#2820)
e977a34
@SidharthBansal
checkpoint 2
4a76ca7
@SidharthBansal
User is created from sign up process successfully
7b3407d
@SidharthBansal
create a usertag_with_omniauth
c029cc0
@SidharthBansal
Search a usertag for oauth
fb3f818
@SidharthBansal
search user_tag existing in db
a4c4d4c
@SidharthBansal
create a user with omniauth test
d10dc4e
@SidharthBansal
LOGIN WORKS
e379501
@SidharthBansal
current_user=(user) method removed
84dba78
@ghost ghost assigned SidharthBansal Jun 13, 2018
@ghost ghost added the in progress label Jun 13, 2018
@plotsbot
Copy link
Collaborator

1 Warning
⚠️ It looks like you merged from master in this pull request. Please rebase to get rid of the merge commits – you may want to rewind the master branch and rebase instead of merging in from master, which can cause problems when accepting new code!
2 Messages
📖 @SidharthBansal Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progresss’, please include ‘[WIP]’ in the title.

Generated by 🚫 Danger

@SidharthBansal SidharthBansal merged commit 03ebf66 into publiclab:unstable Jun 13, 2018
@ghost ghost removed the in progress label Jun 13, 2018
@SidharthBansal SidharthBansal mentioned this pull request Jun 18, 2018
Merged
5 tasks
@SidharthBansal SidharthBansal added this to the OAUTH LOGIN milestone Jun 20, 2018
@jywarren jywarren mentioned this pull request Dec 15, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SidharthBansal SidharthBansal

Labels
summer-of-code
Projects
None yet
Milestone
Login/SignUp & OAuth
Development

Successfully merging this pull request may close these issues.
6 participants
@SidharthBansal @plotsbot @devamaz @KirbyBrown @jywarren @Souravirus