{"action":"created","comment":{"url":"https://api.github.com/repos/dtisdall/mentor-me/pulls/comments/43583487","id":43583487,"diff_hunk":"@@ -15,9 +15,11 @@ def create\n   end\n \n   def update\n-    @timeslot = Timeslot.find_by(id: safe_params[:id])\n-    @timeslot.student_id = current_user.id\n-    if @timeslot.save\n+    timeslot = Timeslot.find_by(id: safe_params[:id])\n+    timeslot.student_id = current_user.id","path":"app/controllers/api/timeslots_controller.rb","position":8,"original_position":8,"commit_id":"f548cda362000dbe5febbe84463a2ad4d0740d35","original_commit_id":"f548cda362000dbe5febbe84463a2ad4d0740d35","user":{"login":"dcr8898","id":12485272,"avatar_url":"https://avatars.githubusercontent.com/u/12485272?v=3","gravatar_id":"","url":"https://api.github.com/users/dcr8898","html_url":"https://github.com/dcr8898","followers_url":"https://api.github.com/users/dcr8898/followers","following_url":"https://api.github.com/users/dcr8898/following{/other_user}","gists_url":"https://api.github.com/users/dcr8898/gists{/gist_id}","starred_url":"https://api.github.com/users/dcr8898/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dcr8898/subscriptions","organizations_url":"https://api.github.com/users/dcr8898/orgs","repos_url":"https://api.github.com/users/dcr8898/repos","events_url":"https://api.github.com/users/dcr8898/events{/privacy}","received_events_url":"https://api.github.com/users/dcr8898/received_events","type":"User","site_admin":false},"body":"Do you think I should add that kind of check now or add it as an issue to be addressed?","created_at":"2015-11-01T15:09:06Z","updated_at":"2015-11-01T15:09:06Z","html_url":"https://github.com/dtisdall/mentor-me/pull/38#discussion_r43583487","pull_request_url":"https://api.github.com/repos/dtisdall/mentor-me/pulls/38","_links":{"self":{"href":"https://api.github.com/repos/dtisdall/mentor-me/pulls/comments/43583487"},"html":{"href":"https://github.com/dtisdall/mentor-me/pull/38#discussion_r43583487"},"pull_request":{"href":"https://api.github.com/repos/dtisdall/mentor-me/pulls/38"}}},"pull_request":{"url":"https://api.github.com/repos/dtisdall/mentor-me/pulls/38","id":49372125,"html_url":"https://github.com/dtisdall/mentor-me/pull/38","diff_url":"https://github.com/dtisdall/mentor-me/pull/38.diff","patch_url":"https://github.com/dtisdall/mentor-me/pull/38.patch","issue_url":"https://api.github.com/repos/dtisdall/mentor-me/issues/38","number":38,"state":"open","locked":false,"title":"Dcr8898 email notifications","user":{"login":"dcr8898","id":12485272,"avatar_url":"https://avatars.githubusercontent.com/u/12485272?v=3","gravatar_id":"","url":"https://api.github.com/users/dcr8898","html_url":"https://github.com/dcr8898","followers_url":"https://api.github.com/users/dcr8898/followers","following_url":"https://api.github.com/users/dcr8898/following{/other_user}","gists_url":"https://api.github.com/users/dcr8898/gists{/gist_id}","starred_url":"https://api.github.com/users/dcr8898/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dcr8898/subscriptions","organizations_url":"https://api.github.com/users/dcr8898/orgs","repos_url":"https://api.github.com/users/dcr8898/repos","events_url":"https://api.github.com/users/dcr8898/events{/privacy}","received_events_url":"https://api.github.com/users/dcr8898/received_events","type":"User","site_admin":false},"body":"Okay, this looks like it can't automerge likely because I rebased to master, not dev, and master and dev are not currently in sync.  Suggestions for a resolution?\r\n\r\nThis setup uses the following configuration in 'config/environments/production.rb':\r\n\r\n`````ruby\r\n  config.action_mailer.raise_delivery_errors = true\r\n  config.action_mailer.delivery_method = :smtp\r\n  host = 'mentor-me-dev.herokuapp.com'\r\n  config.action_mailer.default_url_options = { host: host }\r\n  ActionMailer::Base.smtp_settings = {\r\n    :address        => 'smtp.sendgrid.net',\r\n    :port           => '587',\r\n    :authentication => :plain,\r\n    :user_name      => ENV['SENDGRID_USERNAME'], # The SendGrid 'ID' David provided\r\n    :password       => ENV['SENDGRID_PASSWORD'],  # The SendGrid 'secret' David provided\r\n    :domain         => 'heroku.com',\r\n    :enable_starttls_auto => true\r\n  }\r\n`````\r\n\r\nTHIS CONFIG DOES *NOT* WORK!  It fails with the following error:\r\n\r\n`````ruby\r\nNet::SMTPAuthenticationError (535 Authentication failed: Bad username / password\r\n)\r\n`````\r\n\r\nNote that this is a send error; the emails are being generated correctly.  In the development environment emails are created and then logged to the server console.  They are creating correctly there.  I don't see a way for me to troubleshoot this further, since it is essentially a configuration issue for which I do not have access to the necessary data (on the SendGrid side).\r\n\r\nThe configuration setup I used is consistent with both:\r\n\r\nhttps://www.railstutorial.org/book/account_activation_password_reset#code-sendgrid_config\r\nand\r\nhttps://sendgrid.com/docs/Integrate/Frameworks/rubyonrails.html#-Configure-ActionMailer-to-Use-SendGrid\r\n\r\nSoooo . . . any thoughts on either the Dev/Master issue or this config question would be welcome.\r\n\r\nHappy Day After Halloween!\r\n\r\nDamian","created_at":"2015-11-01T13:43:32Z","updated_at":"2015-11-01T15:09:06Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/dtisdall/mentor-me/pulls/38/commits","review_comments_url":"https://api.github.com/repos/dtisdall/mentor-me/pulls/38/comments","review_comment_url":"https://api.github.com/repos/dtisdall/mentor-me/pulls/comments{/number}","comments_url":"https://api.github.com/repos/dtisdall/mentor-me/issues/38/comments","statuses_url":"https://api.github.com/repos/dtisdall/mentor-me/statuses/f548cda362000dbe5febbe84463a2ad4d0740d35","head":{"label":"dtisdall:dcr8898-email-notifications","ref":"dcr8898-email-notifications","sha":"f548cda362000dbe5febbe84463a2ad4d0740d35","user":{"login":"dtisdall","id":5506173,"avatar_url":"https://avatars.githubusercontent.com/u/5506173?v=3","gravatar_id":"","url":"https://api.github.com/users/dtisdall","html_url":"https://github.com/dtisdall","followers_url":"https://api.github.com/users/dtisdall/followers","following_url":"https://api.github.com/users/dtisdall/following{/other_user}","gists_url":"https://api.github.com/users/dtisdall/gists{/gist_id}","starred_url":"https://api.github.com/users/dtisdall/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dtisdall/subscriptions","organizations_url":"https://api.github.com/users/dtisdall/orgs","repos_url":"https://api.github.com/users/dtisdall/repos","events_url":"https://api.github.com/users/dtisdall/events{/privacy}","received_events_url":"https://api.github.com/users/dtisdall/received_events","type":"User","site_admin":false},"repo":{"id":45208842,"name":"mentor-me","full_name":"dtisdall/mentor-me","owner":{"login":"dtisdall","id":5506173,"avatar_url":"https://avatars.githubusercontent.com/u/5506173?v=3","gravatar_id":"","url":"https://api.github.com/users/dtisdall","html_url":"https://github.com/dtisdall","followers_url":"https://api.github.com/users/dtisdall/followers","following_url":"https://api.github.com/users/dtisdall/following{/other_user}","gists_url":"https://api.github.com/users/dtisdall/gists{/gist_id}","starred_url":"https://api.github.com/users/dtisdall/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dtisdall/subscriptions","organizations_url":"https://api.github.com/users/dtisdall/orgs","repos_url":"https://api.github.com/users/dtisdall/repos","events_url":"https://api.github.com/users/dtisdall/events{/privacy}","received_events_url":"https://api.github.com/users/dtisdall/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/dtisdall/mentor-me","description":"","fork":false,"url":"https://api.github.com/repos/dtisdall/mentor-me","forks_url":"https://api.github.com/repos/dtisdall/mentor-me/forks","keys_url":"https://api.github.com/repos/dtisdall/mentor-me/keys{/key_id}","collaborators_url":"https://api.github.com/repos/dtisdall/mentor-me/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/dtisdall/mentor-me/teams","hooks_url":"https://api.github.com/repos/dtisdall/mentor-me/hooks","issue_events_url":"https://api.github.com/repos/dtisdall/mentor-me/issues/events{/number}","events_url":"https://api.github.com/repos/dtisdall/mentor-me/events","assignees_url":"https://api.github.com/repos/dtisdall/mentor-me/assignees{/user}","branches_url":"https://api.github.com/repos/dtisdall/mentor-me/branches{/branch}","tags_url":"https://api.github.com/repos/dtisdall/mentor-me/tags","blobs_url":"https://api.github.com/repos/dtisdall/mentor-me/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/dtisdall/mentor-me/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/dtisdall/mentor-me/git/refs{/sha}","trees_url":"https://api.github.com/repos/dtisdall/mentor-me/git/trees{/sha}","statuses_url":"https://api.github.com/repos/dtisdall/mentor-me/statuses/{sha}","languages_url":"https://api.github.com/repos/dtisdall/mentor-me/languages","stargazers_url":"https://api.github.com/repos/dtisdall/mentor-me/stargazers","contributors_url":"https://api.github.com/repos/dtisdall/mentor-me/contributors","subscribers_url":"https://api.github.com/repos/dtisdall/mentor-me/subscribers","subscription_url":"https://api.github.com/repos/dtisdall/mentor-me/subscription","commits_url":"https://api.github.com/repos/dtisdall/mentor-me/commits{/sha}","git_commits_url":"https://api.github.com/repos/dtisdall/mentor-me/git/commits{/sha}","comments_url":"https://api.github.com/repos/dtisdall/mentor-me/comments{/number}","issue_comment_url":"https://api.github.com/repos/dtisdall/mentor-me/issues/comments{/number}","contents_url":"https://api.github.com/repos/dtisdall/mentor-me/contents/{+path}","compare_url":"https://api.github.com/repos/dtisdall/mentor-me/compare/{base}...{head}","merges_url":"https://api.github.com/repos/dtisdall/mentor-me/merges","archive_url":"https://api.github.com/repos/dtisdall/mentor-me/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/dtisdall/mentor-me/downloads","issues_url":"https://api.github.com/repos/dtisdall/mentor-me/issues{/number}","pulls_url":"https://api.github.com/repos/dtisdall/mentor-me/pulls{/number}","milestones_url":"https://api.github.com/repos/dtisdall/mentor-me/milestones{/number}","notifications_url":"https://api.github.com/repos/dtisdall/mentor-me/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/dtisdall/mentor-me/labels{/name}","releases_url":"https://api.github.com/repos/dtisdall/mentor-me/releases{/id}","created_at":"2015-10-29T20:31:11Z","updated_at":"2015-10-30T22:05:33Z","pushed_at":"2015-11-01T13:43:32Z","git_url":"git://github.com/dtisdall/mentor-me.git","ssh_url":"git@github.com:dtisdall/mentor-me.git","clone_url":"https://github.com/dtisdall/mentor-me.git","svn_url":"https://github.com/dtisdall/mentor-me","homepage":null,"size":11352,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"development"}},"base":{"label":"dtisdall:development","ref":"development","sha":"6c8b84b1893ac88672db819155bdde77c34c9f0f","user":{"login":"dtisdall","id":5506173,"avatar_url":"https://avatars.githubusercontent.com/u/5506173?v=3","gravatar_id":"","url":"https://api.github.com/users/dtisdall","html_url":"https://github.com/dtisdall","followers_url":"https://api.github.com/users/dtisdall/followers","following_url":"https://api.github.com/users/dtisdall/following{/other_user}","gists_url":"https://api.github.com/users/dtisdall/gists{/gist_id}","starred_url":"https://api.github.com/users/dtisdall/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dtisdall/subscriptions","organizations_url":"https://api.github.com/users/dtisdall/orgs","repos_url":"https://api.github.com/users/dtisdall/repos","events_url":"https://api.github.com/users/dtisdall/events{/privacy}","received_events_url":"https://api.github.com/users/dtisdall/received_events","type":"User","site_admin":false},"repo":{"id":45208842,"name":"mentor-me","full_name":"dtisdall/mentor-me","owner":{"login":"dtisdall","id":5506173,"avatar_url":"https://avatars.githubusercontent.com/u/5506173?v=3","gravatar_id":"","url":"https://api.github.com/users/dtisdall","html_url":"https://github.com/dtisdall","followers_url":"https://api.github.com/users/dtisdall/followers","following_url":"https://api.github.com/users/dtisdall/following{/other_user}","gists_url":"https://api.github.com/users/dtisdall/gists{/gist_id}","starred_url":"https://api.github.com/users/dtisdall/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dtisdall/subscriptions","organizations_url":"https://api.github.com/users/dtisdall/orgs","repos_url":"https://api.github.com/users/dtisdall/repos","events_url":"https://api.github.com/users/dtisdall/events{/privacy}","received_events_url":"https://api.github.com/users/dtisdall/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/dtisdall/mentor-me","description":"","fork":false,"url":"https://api.github.com/repos/dtisdall/mentor-me","forks_url":"https://api.github.com/repos/dtisdall/mentor-me/forks","keys_url":"https://api.github.com/repos/dtisdall/mentor-me/keys{/key_id}","collaborators_url":"https://api.github.com/repos/dtisdall/mentor-me/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/dtisdall/mentor-me/teams","hooks_url":"https://api.github.com/repos/dtisdall/mentor-me/hooks","issue_events_url":"https://api.github.com/repos/dtisdall/mentor-me/issues/events{/number}","events_url":"https://api.github.com/repos/dtisdall/mentor-me/events","assignees_url":"https://api.github.com/repos/dtisdall/mentor-me/assignees{/user}","branches_url":"https://api.github.com/repos/dtisdall/mentor-me/branches{/branch}","tags_url":"https://api.github.com/repos/dtisdall/mentor-me/tags","blobs_url":"https://api.github.com/repos/dtisdall/mentor-me/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/dtisdall/mentor-me/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/dtisdall/mentor-me/git/refs{/sha}","trees_url":"https://api.github.com/repos/dtisdall/mentor-me/git/trees{/sha}","statuses_url":"https://api.github.com/repos/dtisdall/mentor-me/statuses/{sha}","languages_url":"https://api.github.com/repos/dtisdall/mentor-me/languages","stargazers_url":"https://api.github.com/repos/dtisdall/mentor-me/stargazers","contributors_url":"https://api.github.com/repos/dtisdall/mentor-me/contributors","subscribers_url":"https://api.github.com/repos/dtisdall/mentor-me/subscribers","subscription_url":"https://api.github.com/repos/dtisdall/mentor-me/subscription","commits_url":"https://api.github.com/repos/dtisdall/mentor-me/commits{/sha}","git_commits_url":"https://api.github.com/repos/dtisdall/mentor-me/git/commits{/sha}","comments_url":"https://api.github.com/repos/dtisdall/mentor-me/comments{/number}","issue_comment_url":"https://api.github.com/repos/dtisdall/mentor-me/issues/comments{/number}","contents_url":"https://api.github.com/repos/dtisdall/mentor-me/contents/{+path}","compare_url":"https://api.github.com/repos/dtisdall/mentor-me/compare/{base}...{head}","merges_url":"https://api.github.com/repos/dtisdall/mentor-me/merges","archive_url":"https://api.github.com/repos/dtisdall/mentor-me/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/dtisdall/mentor-me/downloads","issues_url":"https://api.github.com/repos/dtisdall/mentor-me/issues{/number}","pulls_url":"https://api.github.com/repos/dtisdall/mentor-me/pulls{/number}","milestones_url":"https://api.github.com/repos/dtisdall/mentor-me/milestones{/number}","notifications_url":"https://api.github.com/repos/dtisdall/mentor-me/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/dtisdall/mentor-me/labels{/name}","releases_url":"https://api.github.com/repos/dtisdall/mentor-me/releases{/id}","created_at":"2015-10-29T20:31:11Z","updated_at":"2015-10-30T22:05:33Z","pushed_at":"2015-11-01T13:43:32Z","git_url":"git://github.com/dtisdall/mentor-me.git","ssh_url":"git@github.com:dtisdall/mentor-me.git","clone_url":"https://github.com/dtisdall/mentor-me.git","svn_url":"https://github.com/dtisdall/mentor-me","homepage":null,"size":11352,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"development"}},"_links":{"self":{"href":"https://api.github.com/repos/dtisdall/mentor-me/pulls/38"},"html":{"href":"https://github.com/dtisdall/mentor-me/pull/38"},"issue":{"href":"https://api.github.com/repos/dtisdall/mentor-me/issues/38"},"comments":{"href":"https://api.github.com/repos/dtisdall/mentor-me/issues/38/comments"},"review_comments":{"href":"https://api.github.com/repos/dtisdall/mentor-me/pulls/38/comments"},"review_comment":{"href":"https://api.github.com/repos/dtisdall/mentor-me/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/dtisdall/mentor-me/pulls/38/commits"},"statuses":{"href":"https://api.github.com/repos/dtisdall/mentor-me/statuses/f548cda362000dbe5febbe84463a2ad4d0740d35"}}}}