-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Issue 5259: Switched to logged_in_as(roles) method to simplify authentication logic #5660
Conversation
Thanks for opening this pull request! This space is protected by our Code of Conduct - and we're here to help. |
@publiclab/reviewers - this is my first pull request, I'd love any feedback you could give me. Thanks! |
Generated by 🚫 Danger |
This is super!!! Thanks so much!!! |
Congrats on merging your first pull request! 🙌🎉⚡️ Help others take their first stepNow that you've merged your first pull request, you're the perfect person to help someone else out with this challenging first step. 🙌 Try looking at this list of `first-timers-only` issues, and see if someone else is waiting for feedback, or even stuck! 😕 People often get stuck at the same steps, so you might be able to help someone get unstuck, or help lead them to some documentation that'd help. Reach out and be encouraging and friendly! 😄 🎉 Read about how to help support another newcomer here, or find other ways to offer mutual support here. |
* OAuth route creation for MK and SWB * OAuth routes created * Github working properly * Modified the route to accept the provider * OAuth completed * removed codeclimate issues * Documentation added * test modified * tests modified * modified test to have roles * Travis is passing * Added OAuth tests * made travis pass * username removed from CDSM * Removed redundant test * Fixing date issue in subscription mailer (#5638) * add nid to rss titles (#5644) * Fix scraped image system test bug (#5646) * Fix scraped image system test bug * Update node_test.rb * Create post_test.rb to test posting at /post (#5605) * Create post_test.rb * UserSession.create(users(:bob)) # log in * Update post_test.rb * Update rich.html.erb * Update post_test.rb * Update post_test.rb * Trying login via modal * add login-button id * Update post_test.rb * Update post_test.rb * Update post_test.rb * locators instead of css "It appears you may be passing a CSS selector or XPath expression rather than a locator. Please see the documentation for acceptable locator values." * locators instead of css "It appears you may be passing a CSS selector or XPath expression rather than a locator. Please see the documentation for acceptable locator values." * Update post_test.rb * /images/pl.png in scraped image * /images/pl.png in scraped image * Update post_test.rb * add assert_page_reloads * Update post_test.rb * Update post_test.rb * Update post_test.rb * Update post_test.rb * fixed image drag and drop bug (#5657) * Database tweaks for performance (#5575) * Database tweaks for performance * Reduce innodb buffer pool size because of low memory * Reduce RAM burden * Reduce memory consumption following mysqltuner advice. * Even more conservative limits for RAM * Update home.html.erb * Corrected the number of notes appearing on one line (#5661) * Some mistakes corrected in notes.html.erb * Wait 4 * Issue 5259: Used logged_in_as method to replace current_user.role condition (#5660) * Update subscriptions.html.erb * fix logged_in_as in controllers (#5677) * fix logged_in_as in controllers * add wait 4 to system test... odd * Update subscriptions.html.erb * Update subscriptions.html.erb * Bump cytoscape from 3.5.4 to 3.6.0 (#5662) Bumps [cytoscape](https://github.com/cytoscape/cytoscape.js) from 3.5.4 to 3.6.0. - [Release notes](https://github.com/cytoscape/cytoscape.js/releases) - [Commits](cytoscape/cytoscape.js@v3.5.4...v3.6.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Dashboard system test (#5682) * Dashboard system test * Update dashboard_test.rb * Capybara.default_max_wait_time = 5 * fix
…clab#5640) * OAuth route creation for MK and SWB * OAuth routes created * Github working properly * Modified the route to accept the provider * OAuth completed * removed codeclimate issues * Documentation added * test modified * tests modified * modified test to have roles * Travis is passing * Added OAuth tests * made travis pass * username removed from CDSM * Removed redundant test * Fixing date issue in subscription mailer (publiclab#5638) * add nid to rss titles (publiclab#5644) * Fix scraped image system test bug (publiclab#5646) * Fix scraped image system test bug * Update node_test.rb * Create post_test.rb to test posting at /post (publiclab#5605) * Create post_test.rb * UserSession.create(users(:bob)) # log in * Update post_test.rb * Update rich.html.erb * Update post_test.rb * Update post_test.rb * Trying login via modal * add login-button id * Update post_test.rb * Update post_test.rb * Update post_test.rb * locators instead of css "It appears you may be passing a CSS selector or XPath expression rather than a locator. Please see the documentation for acceptable locator values." * locators instead of css "It appears you may be passing a CSS selector or XPath expression rather than a locator. Please see the documentation for acceptable locator values." * Update post_test.rb * /images/pl.png in scraped image * /images/pl.png in scraped image * Update post_test.rb * add assert_page_reloads * Update post_test.rb * Update post_test.rb * Update post_test.rb * Update post_test.rb * fixed image drag and drop bug (publiclab#5657) * Database tweaks for performance (publiclab#5575) * Database tweaks for performance * Reduce innodb buffer pool size because of low memory * Reduce RAM burden * Reduce memory consumption following mysqltuner advice. * Even more conservative limits for RAM * Update home.html.erb * Corrected the number of notes appearing on one line (publiclab#5661) * Some mistakes corrected in notes.html.erb * Wait 4 * Issue 5259: Used logged_in_as method to replace current_user.role condition (publiclab#5660) * Update subscriptions.html.erb * fix logged_in_as in controllers (publiclab#5677) * fix logged_in_as in controllers * add wait 4 to system test... odd * Update subscriptions.html.erb * Update subscriptions.html.erb * Bump cytoscape from 3.5.4 to 3.6.0 (publiclab#5662) Bumps [cytoscape](https://github.com/cytoscape/cytoscape.js) from 3.5.4 to 3.6.0. - [Release notes](https://github.com/cytoscape/cytoscape.js/releases) - [Commits](cytoscape/cytoscape.js@v3.5.4...v3.6.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Dashboard system test (publiclab#5682) * Dashboard system test * Update dashboard_test.rb * Capybara.default_max_wait_time = 5 * fix
Fixes #5259
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
rake test
Reviewers
Please review.