{"action":"created","comment":{"url":"https://api.github.com/repos/framgia/fels_55/pulls/comments/30969192","id":30969192,"diff_hunk":"@@ -1,5 +1,39 @@\n class CategoriesController < ApplicationController\n   def index\n     @categories = Category.paginate(page: params[:page], per_page: 15).order :name\n+<<<<<<< HEAD\n+=======\n+  end\n+\n+  def new\n+    @category = Category.new\n+  end\n+\n+  def create\n+    @category = Category.new params_category\n+    @category.save\n+  end\n+\n+  def edit\n+    @category = Category.find params[:id]\n+  end\n+\n+  def update\n+    @category = Category.find params[:id]\n+    @category.update_attributes params_category\n+  end\n+\n+  def destroy\n+    @category = Category.find(params[:id]).destroy\n+  end\n+\n+  private\n+  def params_category\n+    params.require(:category).permit :name, :description \n+  end\n+\n+  def load_category\n+    @categories = Category.paginate(page: params[:page]).order :name\n+>>>>>>> word list","path":"app/controllers/categories_controller.rb","position":37,"original_position":37,"commit_id":"3d0aec5b37315a20e3ef8f01ee50e7b5dc1822bc","original_commit_id":"3d0aec5b37315a20e3ef8f01ee50e7b5dc1822bc","user":{"login":"RathanakSreang","id":12246079,"avatar_url":"https://avatars.githubusercontent.com/u/12246079?v=3","gravatar_id":"","url":"https://api.github.com/users/RathanakSreang","html_url":"https://github.com/RathanakSreang","followers_url":"https://api.github.com/users/RathanakSreang/followers","following_url":"https://api.github.com/users/RathanakSreang/following{/other_user}","gists_url":"https://api.github.com/users/RathanakSreang/gists{/gist_id}","starred_url":"https://api.github.com/users/RathanakSreang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/RathanakSreang/subscriptions","organizations_url":"https://api.github.com/users/RathanakSreang/orgs","repos_url":"https://api.github.com/users/RathanakSreang/repos","events_url":"https://api.github.com/users/RathanakSreang/events{/privacy}","received_events_url":"https://api.github.com/users/RathanakSreang/received_events","type":"User","site_admin":false},"body":"Remove","created_at":"2015-05-25T08:42:42Z","updated_at":"2015-05-25T08:42:42Z","html_url":"https://github.com/framgia/fels_55/pull/17#discussion_r30969192","pull_request_url":"https://api.github.com/repos/framgia/fels_55/pulls/17","_links":{"self":{"href":"https://api.github.com/repos/framgia/fels_55/pulls/comments/30969192"},"html":{"href":"https://github.com/framgia/fels_55/pull/17#discussion_r30969192"},"pull_request":{"href":"https://api.github.com/repos/framgia/fels_55/pulls/17"}}},"pull_request":{"url":"https://api.github.com/repos/framgia/fels_55/pulls/17","id":35810763,"html_url":"https://github.com/framgia/fels_55/pull/17","diff_url":"https://github.com/framgia/fels_55/pull/17.diff","patch_url":"https://github.com/framgia/fels_55/pull/17.patch","issue_url":"https://api.github.com/repos/framgia/fels_55/issues/17","number":17,"state":"open","locked":false,"title":"Word list","user":{"login":"NgengChhengkim","id":9549149,"avatar_url":"https://avatars.githubusercontent.com/u/9549149?v=3","gravatar_id":"","url":"https://api.github.com/users/NgengChhengkim","html_url":"https://github.com/NgengChhengkim","followers_url":"https://api.github.com/users/NgengChhengkim/followers","following_url":"https://api.github.com/users/NgengChhengkim/following{/other_user}","gists_url":"https://api.github.com/users/NgengChhengkim/gists{/gist_id}","starred_url":"https://api.github.com/users/NgengChhengkim/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NgengChhengkim/subscriptions","organizations_url":"https://api.github.com/users/NgengChhengkim/orgs","repos_url":"https://api.github.com/users/NgengChhengkim/repos","events_url":"https://api.github.com/users/NgengChhengkim/events{/privacy}","received_events_url":"https://api.github.com/users/NgengChhengkim/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-05-20T09:00:48Z","updated_at":"2015-05-25T08:42:42Z","closed_at":null,"merged_at":null,"merge_commit_sha":"fd253bb2a036d524b18b2d5fb73170f261e0df8d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/framgia/fels_55/pulls/17/commits","review_comments_url":"https://api.github.com/repos/framgia/fels_55/pulls/17/comments","review_comment_url":"https://api.github.com/repos/framgia/fels_55/pulls/comments{/number}","comments_url":"https://api.github.com/repos/framgia/fels_55/issues/17/comments","statuses_url":"https://api.github.com/repos/framgia/fels_55/statuses/3d0aec5b37315a20e3ef8f01ee50e7b5dc1822bc","head":{"label":"NgengChhengkim:word-list","ref":"word-list","sha":"3d0aec5b37315a20e3ef8f01ee50e7b5dc1822bc","user":{"login":"NgengChhengkim","id":9549149,"avatar_url":"https://avatars.githubusercontent.com/u/9549149?v=3","gravatar_id":"","url":"https://api.github.com/users/NgengChhengkim","html_url":"https://github.com/NgengChhengkim","followers_url":"https://api.github.com/users/NgengChhengkim/followers","following_url":"https://api.github.com/users/NgengChhengkim/following{/other_user}","gists_url":"https://api.github.com/users/NgengChhengkim/gists{/gist_id}","starred_url":"https://api.github.com/users/NgengChhengkim/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NgengChhengkim/subscriptions","organizations_url":"https://api.github.com/users/NgengChhengkim/orgs","repos_url":"https://api.github.com/users/NgengChhengkim/repos","events_url":"https://api.github.com/users/NgengChhengkim/events{/privacy}","received_events_url":"https://api.github.com/users/NgengChhengkim/received_events","type":"User","site_admin":false},"repo":{"id":35375395,"name":"fels_55","full_name":"NgengChhengkim/fels_55","owner":{"login":"NgengChhengkim","id":9549149,"avatar_url":"https://avatars.githubusercontent.com/u/9549149?v=3","gravatar_id":"","url":"https://api.github.com/users/NgengChhengkim","html_url":"https://github.com/NgengChhengkim","followers_url":"https://api.github.com/users/NgengChhengkim/followers","following_url":"https://api.github.com/users/NgengChhengkim/following{/other_user}","gists_url":"https://api.github.com/users/NgengChhengkim/gists{/gist_id}","starred_url":"https://api.github.com/users/NgengChhengkim/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NgengChhengkim/subscriptions","organizations_url":"https://api.github.com/users/NgengChhengkim/orgs","repos_url":"https://api.github.com/users/NgengChhengkim/repos","events_url":"https://api.github.com/users/NgengChhengkim/events{/privacy}","received_events_url":"https://api.github.com/users/NgengChhengkim/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/NgengChhengkim/fels_55","description":"Framgia E-Learning System (training)","fork":true,"url":"https://api.github.com/repos/NgengChhengkim/fels_55","forks_url":"https://api.github.com/repos/NgengChhengkim/fels_55/forks","keys_url":"https://api.github.com/repos/NgengChhengkim/fels_55/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NgengChhengkim/fels_55/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NgengChhengkim/fels_55/teams","hooks_url":"https://api.github.com/repos/NgengChhengkim/fels_55/hooks","issue_events_url":"https://api.github.com/repos/NgengChhengkim/fels_55/issues/events{/number}","events_url":"https://api.github.com/repos/NgengChhengkim/fels_55/events","assignees_url":"https://api.github.com/repos/NgengChhengkim/fels_55/assignees{/user}","branches_url":"https://api.github.com/repos/NgengChhengkim/fels_55/branches{/branch}","tags_url":"https://api.github.com/repos/NgengChhengkim/fels_55/tags","blobs_url":"https://api.github.com/repos/NgengChhengkim/fels_55/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NgengChhengkim/fels_55/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NgengChhengkim/fels_55/git/refs{/sha}","trees_url":"https://api.github.com/repos/NgengChhengkim/fels_55/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NgengChhengkim/fels_55/statuses/{sha}","languages_url":"https://api.github.com/repos/NgengChhengkim/fels_55/languages","stargazers_url":"https://api.github.com/repos/NgengChhengkim/fels_55/stargazers","contributors_url":"https://api.github.com/repos/NgengChhengkim/fels_55/contributors","subscribers_url":"https://api.github.com/repos/NgengChhengkim/fels_55/subscribers","subscription_url":"https://api.github.com/repos/NgengChhengkim/fels_55/subscription","commits_url":"https://api.github.com/repos/NgengChhengkim/fels_55/commits{/sha}","git_commits_url":"https://api.github.com/repos/NgengChhengkim/fels_55/git/commits{/sha}","comments_url":"https://api.github.com/repos/NgengChhengkim/fels_55/comments{/number}","issue_comment_url":"https://api.github.com/repos/NgengChhengkim/fels_55/issues/comments{/number}","contents_url":"https://api.github.com/repos/NgengChhengkim/fels_55/contents/{+path}","compare_url":"https://api.github.com/repos/NgengChhengkim/fels_55/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NgengChhengkim/fels_55/merges","archive_url":"https://api.github.com/repos/NgengChhengkim/fels_55/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NgengChhengkim/fels_55/downloads","issues_url":"https://api.github.com/repos/NgengChhengkim/fels_55/issues{/number}","pulls_url":"https://api.github.com/repos/NgengChhengkim/fels_55/pulls{/number}","milestones_url":"https://api.github.com/repos/NgengChhengkim/fels_55/milestones{/number}","notifications_url":"https://api.github.com/repos/NgengChhengkim/fels_55/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NgengChhengkim/fels_55/labels{/name}","releases_url":"https://api.github.com/repos/NgengChhengkim/fels_55/releases{/id}","created_at":"2015-05-10T15:00:56Z","updated_at":"2015-04-20T02:23:54Z","pushed_at":"2015-05-25T08:32:07Z","git_url":"git://github.com/NgengChhengkim/fels_55.git","ssh_url":"git@github.com:NgengChhengkim/fels_55.git","clone_url":"https://github.com/NgengChhengkim/fels_55.git","svn_url":"https://github.com/NgengChhengkim/fels_55","homepage":null,"size":291,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"framgia:develop","ref":"develop","sha":"cad96067b952c83b4835dcc25483b0cf4fda8593","user":{"login":"framgia","id":2322183,"avatar_url":"https://avatars.githubusercontent.com/u/2322183?v=3","gravatar_id":"","url":"https://api.github.com/users/framgia","html_url":"https://github.com/framgia","followers_url":"https://api.github.com/users/framgia/followers","following_url":"https://api.github.com/users/framgia/following{/other_user}","gists_url":"https://api.github.com/users/framgia/gists{/gist_id}","starred_url":"https://api.github.com/users/framgia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/framgia/subscriptions","organizations_url":"https://api.github.com/users/framgia/orgs","repos_url":"https://api.github.com/users/framgia/repos","events_url":"https://api.github.com/users/framgia/events{/privacy}","received_events_url":"https://api.github.com/users/framgia/received_events","type":"Organization","site_admin":false},"repo":{"id":34233417,"name":"fels_55","full_name":"framgia/fels_55","owner":{"login":"framgia","id":2322183,"avatar_url":"https://avatars.githubusercontent.com/u/2322183?v=3","gravatar_id":"","url":"https://api.github.com/users/framgia","html_url":"https://github.com/framgia","followers_url":"https://api.github.com/users/framgia/followers","following_url":"https://api.github.com/users/framgia/following{/other_user}","gists_url":"https://api.github.com/users/framgia/gists{/gist_id}","starred_url":"https://api.github.com/users/framgia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/framgia/subscriptions","organizations_url":"https://api.github.com/users/framgia/orgs","repos_url":"https://api.github.com/users/framgia/repos","events_url":"https://api.github.com/users/framgia/events{/privacy}","received_events_url":"https://api.github.com/users/framgia/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/framgia/fels_55","description":"Framgia E-Learning System (training)","fork":false,"url":"https://api.github.com/repos/framgia/fels_55","forks_url":"https://api.github.com/repos/framgia/fels_55/forks","keys_url":"https://api.github.com/repos/framgia/fels_55/keys{/key_id}","collaborators_url":"https://api.github.com/repos/framgia/fels_55/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/framgia/fels_55/teams","hooks_url":"https://api.github.com/repos/framgia/fels_55/hooks","issue_events_url":"https://api.github.com/repos/framgia/fels_55/issues/events{/number}","events_url":"https://api.github.com/repos/framgia/fels_55/events","assignees_url":"https://api.github.com/repos/framgia/fels_55/assignees{/user}","branches_url":"https://api.github.com/repos/framgia/fels_55/branches{/branch}","tags_url":"https://api.github.com/repos/framgia/fels_55/tags","blobs_url":"https://api.github.com/repos/framgia/fels_55/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/framgia/fels_55/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/framgia/fels_55/git/refs{/sha}","trees_url":"https://api.github.com/repos/framgia/fels_55/git/trees{/sha}","statuses_url":"https://api.github.com/repos/framgia/fels_55/statuses/{sha}","languages_url":"https://api.github.com/repos/framgia/fels_55/languages","stargazers_url":"https://api.github.com/repos/framgia/fels_55/stargazers","contributors_url":"https://api.github.com/repos/framgia/fels_55/contributors","subscribers_url":"https://api.github.com/repos/framgia/fels_55/subscribers","subscription_url":"https://api.github.com/repos/framgia/fels_55/subscription","commits_url":"https://api.github.com/repos/framgia/fels_55/commits{/sha}","git_commits_url":"https://api.github.com/repos/framgia/fels_55/git/commits{/sha}","comments_url":"https://api.github.com/repos/framgia/fels_55/comments{/number}","issue_comment_url":"https://api.github.com/repos/framgia/fels_55/issues/comments{/number}","contents_url":"https://api.github.com/repos/framgia/fels_55/contents/{+path}","compare_url":"https://api.github.com/repos/framgia/fels_55/compare/{base}...{head}","merges_url":"https://api.github.com/repos/framgia/fels_55/merges","archive_url":"https://api.github.com/repos/framgia/fels_55/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/framgia/fels_55/downloads","issues_url":"https://api.github.com/repos/framgia/fels_55/issues{/number}","pulls_url":"https://api.github.com/repos/framgia/fels_55/pulls{/number}","milestones_url":"https://api.github.com/repos/framgia/fels_55/milestones{/number}","notifications_url":"https://api.github.com/repos/framgia/fels_55/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/framgia/fels_55/labels{/name}","releases_url":"https://api.github.com/repos/framgia/fels_55/releases{/id}","created_at":"2015-04-20T02:23:54Z","updated_at":"2015-04-20T02:23:54Z","pushed_at":"2015-05-25T08:42:01Z","git_url":"git://github.com/framgia/fels_55.git","ssh_url":"git@github.com:framgia/fels_55.git","clone_url":"https://github.com/framgia/fels_55.git","svn_url":"https://github.com/framgia/fels_55","homepage":null,"size":797,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":5,"forks":2,"open_issues":5,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/framgia/fels_55/pulls/17"},"html":{"href":"https://github.com/framgia/fels_55/pull/17"},"issue":{"href":"https://api.github.com/repos/framgia/fels_55/issues/17"},"comments":{"href":"https://api.github.com/repos/framgia/fels_55/issues/17/comments"},"review_comments":{"href":"https://api.github.com/repos/framgia/fels_55/pulls/17/comments"},"review_comment":{"href":"https://api.github.com/repos/framgia/fels_55/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/framgia/fels_55/pulls/17/commits"},"statuses":{"href":"https://api.github.com/repos/framgia/fels_55/statuses/3d0aec5b37315a20e3ef8f01ee50e7b5dc1822bc"}}}}