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

Fallback email and welcome email with Oauth #3052

Merged
merged 3 commits into from
Jul 11, 2018

Conversation

grvsachdeva
Copy link
Member

@grvsachdeva grvsachdeva commented Jul 11, 2018

Fixes #2241

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!

@plotsbot
Copy link
Collaborator

plotsbot commented Jul 11, 2018

1 Message
📖 @Gauravano 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.

Generated by 🚫 Danger

@grvsachdeva
Copy link
Member Author

@SidharthBansal I have called the mailer from user_sessions_controller.rb. I hope that is sufficient. What do you think?

@SidharthBansal
Copy link
Member

Yeah that is sufficient. It will be best if you could check it via testing or on unstable.

@grvsachdeva
Copy link
Member Author

grvsachdeva commented Jul 11, 2018 via email

@SidharthBansal
Copy link
Member

No problem. I will send you details on mail to use the oauth in development. You can check the feature.
Thanks

@SidharthBansal
Copy link
Member

Please see your gitter messages

@jywarren
Copy link
Member

Awesome - ping me when it's ready! Thanks, both of you!

@SidharthBansal
Copy link
Member

Gaurav as now we are getting 2 messages. I think this pr is ready ?? @Gauravano

@grvsachdeva
Copy link
Member Author

Actually, I am thinking of writing a test or just an addition in the previous test

@grvsachdeva
Copy link
Member Author

@jywarren its ready to merge!

@jywarren jywarren merged commit 07b5bed into publiclab:master Jul 11, 2018
@ghost ghost removed the ready label Jul 11, 2018
@jywarren
Copy link
Member

Great work!!!

jywarren pushed a commit that referenced this pull request Jul 12, 2018
* changed color of github icon and refactored code

* Update _comment.html.erb (#3048)

* changed icons styles

* changed env back

* some fixes

* all icons width set same

* fix

* added back env

* some fix

* Update API.md

* center align the text

* center align and added or

* added back env

* added spacing in or

* added env back

* errors on signup page (#3044)

* Update .travis.yml

* Swap the providers and email-password login (#3021)

* Change Login page & remove Gemfile.lock from PR

* Add Rails production environment check back in

* Uid visible to admin and account holder (#3039)

* Uid visible to admin and account holder

* few changes

* .

* minor tweaks

* test rectified

* ..

* test rectified

* Fallback email and welcome email with Oauth  (#3052)

* fallback welcome email

* sending welcome mail in oauth

* test

* added back env

* fixes

* removed extra spaves
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
* fallback welcome email

* sending welcome mail in oauth

* test
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
…iclab#3050)

* changed color of github icon and refactored code

* Update _comment.html.erb (publiclab#3048)

* changed icons styles

* changed env back

* some fixes

* all icons width set same

* fix

* added back env

* some fix

* Update API.md

* center align the text

* center align and added or

* added back env

* added spacing in or

* added env back

* errors on signup page (publiclab#3044)

* Update .travis.yml

* Swap the providers and email-password login (publiclab#3021)

* Change Login page & remove Gemfile.lock from PR

* Add Rails production environment check back in

* Uid visible to admin and account holder (publiclab#3039)

* Uid visible to admin and account holder

* few changes

* .

* minor tweaks

* test rectified

* ..

* test rectified

* Fallback email and welcome email with Oauth  (publiclab#3052)

* fallback welcome email

* sending welcome mail in oauth

* test

* added back env

* fixes

* removed extra spaves
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Email for welcoming newcomer at time of Sign up
4 participants