{"action":"created","issue":{"url":"https://api.github.com/repos/publiclab/spectral-workbench/issues/91","labels_url":"https://api.github.com/repos/publiclab/spectral-workbench/issues/91/labels{/name}","comments_url":"https://api.github.com/repos/publiclab/spectral-workbench/issues/91/comments","events_url":"https://api.github.com/repos/publiclab/spectral-workbench/issues/91/events","html_url":"https://github.com/publiclab/spectral-workbench/pull/91","id":59355364,"number":91,"title":"Routes re-factoring and cleaning","user":{"login":"vpowerrc","id":3113102,"avatar_url":"https://avatars.githubusercontent.com/u/3113102?v=3","gravatar_id":"","url":"https://api.github.com/users/vpowerrc","html_url":"https://github.com/vpowerrc","followers_url":"https://api.github.com/users/vpowerrc/followers","following_url":"https://api.github.com/users/vpowerrc/following{/other_user}","gists_url":"https://api.github.com/users/vpowerrc/gists{/gist_id}","starred_url":"https://api.github.com/users/vpowerrc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vpowerrc/subscriptions","organizations_url":"https://api.github.com/users/vpowerrc/orgs","repos_url":"https://api.github.com/users/vpowerrc/repos","events_url":"https://api.github.com/users/vpowerrc/events{/privacy}","received_events_url":"https://api.github.com/users/vpowerrc/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":28,"created_at":"2015-02-28T19:52:20Z","updated_at":"2015-03-02T20:10:03Z","closed_at":"2015-02-28T22:43:28Z","pull_request":{"url":"https://api.github.com/repos/publiclab/spectral-workbench/pulls/91","html_url":"https://github.com/publiclab/spectral-workbench/pull/91","diff_url":"https://github.com/publiclab/spectral-workbench/pull/91.diff","patch_url":"https://github.com/publiclab/spectral-workbench/pull/91.patch"},"body":"This is not yet ready for merging; just posting to stay coordinated."},"comment":{"url":"https://api.github.com/repos/publiclab/spectral-workbench/issues/comments/76804353","html_url":"https://github.com/publiclab/spectral-workbench/pull/91#issuecomment-76804353","issue_url":"https://api.github.com/repos/publiclab/spectral-workbench/issues/91","id":76804353,"user":{"login":"vpowerrc","id":3113102,"avatar_url":"https://avatars.githubusercontent.com/u/3113102?v=3","gravatar_id":"","url":"https://api.github.com/users/vpowerrc","html_url":"https://github.com/vpowerrc","followers_url":"https://api.github.com/users/vpowerrc/followers","following_url":"https://api.github.com/users/vpowerrc/following{/other_user}","gists_url":"https://api.github.com/users/vpowerrc/gists{/gist_id}","starred_url":"https://api.github.com/users/vpowerrc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vpowerrc/subscriptions","organizations_url":"https://api.github.com/users/vpowerrc/orgs","repos_url":"https://api.github.com/users/vpowerrc/repos","events_url":"https://api.github.com/users/vpowerrc/events{/privacy}","received_events_url":"https://api.github.com/users/vpowerrc/received_events","type":"User","site_admin":false},"created_at":"2015-03-02T20:10:03Z","updated_at":"2015-03-02T20:10:03Z","body":"git rebase master \r\nFirst, rewinding head to replay your work on top of it...\r\nApplying: fixed issue with ajax loading icon\r\nApplying: added raw before RDiscount\r\nApplying: changed analyze/spetrum/:id action to spectrum/:id\r\nUsing index info to reconstruct a base tree...\r\nM\tapp/controllers/capture_controller.rb\r\nM\tapp/controllers/spectrums_controller.rb\r\nM\tapp/views/analyze/_clone_results.html.erb\r\nM\tapp/views/analyze/_commenting.html.erb\r\nM\tapp/views/analyze/_compare_search.html.erb\r\nM\tapp/views/analyze/spectrum.html.erb\r\nM\tapp/views/match/_list_results.html.erb\r\nM\tapp/views/match/_livesearch.html.erb\r\nM\tapp/views/match/_match_results.html.erb\r\nM\tapp/views/sets/_spectra.html.erb\r\nM\tapp/views/sets/show.html.erb\r\nM\tapp/views/spectrums/_list.html.erb\r\nM\tconfig/routes.rb\r\nM\ttest/functional/spectrums_controller_test.rb\r\n<stdin>:1541: trailing whitespace.\r\n</div> \r\n<stdin>:1554: trailing whitespace.\r\n</div> \r\n<stdin>:1616: space before tab in indent.\r\n    \tf.id = \"clone<%= spectrum.id %>form\"\r\n<stdin>:1617: space before tab in indent.\r\n    \tvar i = document.createElement('input');\r\n<stdin>:1618: space before tab in indent.\r\n    \ti.name = \"authenticity_token\"\r\nwarning: squelched 6 whitespace errors\r\nwarning: 11 lines add whitespace errors.\r\nFalling back to patching base and 3-way merge...\r\nAuto-merging test/functional/spectrums_controller_test.rb\r\nAuto-merging config/routes.rb\r\nCONFLICT (content): Merge conflict in config/routes.rb\r\nAuto-merging app/views/spectrums/show/_set.html.erb\r\nAuto-merging app/views/spectrums/show/_macros.html.erb\r\nAuto-merging app/views/spectrums/show/_compare.html.erb\r\nAuto-merging app/views/spectrums/show/_clone.html.erb\r\nAuto-merging app/views/spectrums/show.html.erb\r\nAuto-merging app/views/spectrums/_list.html.erb\r\nCONFLICT (content): Merge conflict in app/views/spectrums/_list.html.erb\r\nAuto-merging app/views/sets/show.html.erb\r\nAuto-merging app/views/sets/_spectra.html.erb\r\nAuto-merging app/views/match/_match_results.html.erb\r\nCONFLICT (content): Merge conflict in app/views/match/_match_results.html.erb\r\nAuto-merging app/views/match/_livesearch.html.erb\r\nCONFLICT (content): Merge conflict in app/views/match/_livesearch.html.erb\r\nAuto-merging app/views/match/_list_results.html.erb\r\nCONFLICT (content): Merge conflict in app/views/match/_list_results.html.erb\r\nCONFLICT (modify/delete): app/views/analyze/_commenting.html.erb deleted in changed analyze/spetrum/:id action to spectrum/:id and modified in HEAD. Version HEAD of app/views/analyze/_commenting.html.erb left in tree.\r\nAuto-merging app/controllers/spectrums_controller.rb\r\nCONFLICT (content): Merge conflict in app/controllers/spectrums_controller.rb\r\nAuto-merging app/controllers/capture_controller.rb\r\nRemoving app/controllers/analyze_controller.rb\r\nFailed to merge in the changes.\r\nPatch failed at 0003 changed analyze/spetrum/:id action to spectrum/:id\r\nThe copy of the patch that failed is found in:\r\n   /home/viduranga/Desktop/gsoc/publiclab/spectral-workbench/.git/rebase-apply/patch\r\n\r\nWhen you have resolved this problem, run \"git rebase --continue\".\r\nIf you prefer to skip this patch, run \"git rebase --skip\" instead.\r\nTo check out the original branch and stop rebasing, run \"git rebase --abort\".\r\n"}}