{"action":"opened","number":141,"pull_request":{"url":"https://api.github.com/repos/serlo-org/athene2/pulls/141","id":39616476,"html_url":"https://github.com/serlo-org/athene2/pull/141","diff_url":"https://github.com/serlo-org/athene2/pull/141.diff","patch_url":"https://github.com/serlo-org/athene2/pull/141.patch","issue_url":"https://api.github.com/repos/serlo-org/athene2/issues/141","number":141,"state":"open","locked":false,"title":"Make athene2-editor a git submodule","user":{"login":"inyono","id":1508477,"avatar_url":"https://avatars.githubusercontent.com/u/1508477?v=3","gravatar_id":"","url":"https://api.github.com/users/inyono","html_url":"https://github.com/inyono","followers_url":"https://api.github.com/users/inyono/followers","following_url":"https://api.github.com/users/inyono/following{/other_user}","gists_url":"https://api.github.com/users/inyono/gists{/gist_id}","starred_url":"https://api.github.com/users/inyono/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/inyono/subscriptions","organizations_url":"https://api.github.com/users/inyono/orgs","repos_url":"https://api.github.com/users/inyono/repos","events_url":"https://api.github.com/users/inyono/events{/privacy}","received_events_url":"https://api.github.com/users/inyono/received_events","type":"User","site_admin":false},"body":"Closes #74.\r\n\r\n@arekkas @creitiv @Knorrke. I'll documented the new workflow for the editor below. Do you see this as an improvement to the old way of doing things? IMHO only the testing improved, since the changes `athene2-editor` can be directly seen in the usual local environment. But committing changes still needs two pull requests (for those that can't directly push to `athene2`).\r\n\r\n# Workflow\r\n\r\n**tl;dr**. Basically, the directory `src/asssets/athene2-editor` will be treated as a own git repository and the `athene2` repository just refers to the commit to use. So to make changes, we both have to commit changes to the `athene2-editor` repository and update the reference in `athene2` to the new commit. Furthermore, cloning and pulling must include the submodule, too.\r\n\r\n## Cloning\r\n\r\nAdd `--resursive` to clone submodules, too.\r\n\r\n```\r\ngit clone git@github.com:serlo-org/athene2.git --recursive\r\n```\r\n\r\n## Pulling external changes (for athene2 and athene2-editor)\r\n\r\nAs usual, pull athene2. Also update submodules\r\n\r\n```\r\ngit submodule update --recursive\r\n```\r\n\r\n**Note:** *This does not pull the latest commit of athene2-editor, but the proper commit specified in the athene2 repository. If you want to update the version of athene2-editor, follow the directions below.*\r\n\r\n## Committing changes to athene2-editor\r\n\r\nEither change the submodule in athene2 or work with the athene2-editor repository directly.\r\n\r\n### Make changes to the submodule\r\n\r\n**tl;dr**. Commit the changes in `src/assets/athene2-editor` and push resp. submit pull requests as usual.\r\n\r\nFirst, commit the changes in athene2-editor:\r\n\r\n```\r\ncd src/assets/athene2-editor\r\ngit checkout -b BRANCH\r\ngit add .\r\ngit commit\r\ngit push -u REMOTE BRANCH\r\n```\r\n\r\nNow you can submit a pull request to athene2-editor.\r\n\r\n### Directly modify athene2-editor\r\n\r\nAs usual, make changes to athene2-editor, and submit a pull request to athene2-editor.  \r\n\r\n## Updating the editor in the athene2 repository\r\n\r\n**tl;dr**. Pull the changes in `src/assets/athene2-editor` and commit `src/assets/athene2-editor` (will be treaded as a file by the `athene2` directory and contains the reference to the `athene2-editor` commit)\r\n\r\nTo update the editor in athene2 (for example, after a pull request got merged), follow these steps:\r\n\r\n```\r\ngit checkout -b BRANCH\r\ncd src/assets/athene2-editor\r\ngit pull origin master\r\ncd ..\r\ngit add athene2-editor\r\ngit commit\r\ngit push -u REMOTE BRANCH\r\n```\r\n\r\nFinally submit a pull request to athene2.\r\n\r\n","created_at":"2015-07-09T19:00:03Z","updated_at":"2015-07-09T19:00:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/serlo-org/athene2/pulls/141/commits","review_comments_url":"https://api.github.com/repos/serlo-org/athene2/pulls/141/comments","review_comment_url":"https://api.github.com/repos/serlo-org/athene2/pulls/comments{/number}","comments_url":"https://api.github.com/repos/serlo-org/athene2/issues/141/comments","statuses_url":"https://api.github.com/repos/serlo-org/athene2/statuses/551efbd3fdbfdce381098b588805570f2f2426b4","head":{"label":"inyono:solve-74","ref":"solve-74","sha":"551efbd3fdbfdce381098b588805570f2f2426b4","user":{"login":"inyono","id":1508477,"avatar_url":"https://avatars.githubusercontent.com/u/1508477?v=3","gravatar_id":"","url":"https://api.github.com/users/inyono","html_url":"https://github.com/inyono","followers_url":"https://api.github.com/users/inyono/followers","following_url":"https://api.github.com/users/inyono/following{/other_user}","gists_url":"https://api.github.com/users/inyono/gists{/gist_id}","starred_url":"https://api.github.com/users/inyono/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/inyono/subscriptions","organizations_url":"https://api.github.com/users/inyono/orgs","repos_url":"https://api.github.com/users/inyono/repos","events_url":"https://api.github.com/users/inyono/events{/privacy}","received_events_url":"https://api.github.com/users/inyono/received_events","type":"User","site_admin":false},"repo":{"id":32057783,"name":"athene2","full_name":"inyono/athene2","owner":{"login":"inyono","id":1508477,"avatar_url":"https://avatars.githubusercontent.com/u/1508477?v=3","gravatar_id":"","url":"https://api.github.com/users/inyono","html_url":"https://github.com/inyono","followers_url":"https://api.github.com/users/inyono/followers","following_url":"https://api.github.com/users/inyono/following{/other_user}","gists_url":"https://api.github.com/users/inyono/gists{/gist_id}","starred_url":"https://api.github.com/users/inyono/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/inyono/subscriptions","organizations_url":"https://api.github.com/users/inyono/orgs","repos_url":"https://api.github.com/users/inyono/repos","events_url":"https://api.github.com/users/inyono/events{/privacy}","received_events_url":"https://api.github.com/users/inyono/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/inyono/athene2","description":"A collaborative, multi tenant learning resources management","fork":true,"url":"https://api.github.com/repos/inyono/athene2","forks_url":"https://api.github.com/repos/inyono/athene2/forks","keys_url":"https://api.github.com/repos/inyono/athene2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/inyono/athene2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/inyono/athene2/teams","hooks_url":"https://api.github.com/repos/inyono/athene2/hooks","issue_events_url":"https://api.github.com/repos/inyono/athene2/issues/events{/number}","events_url":"https://api.github.com/repos/inyono/athene2/events","assignees_url":"https://api.github.com/repos/inyono/athene2/assignees{/user}","branches_url":"https://api.github.com/repos/inyono/athene2/branches{/branch}","tags_url":"https://api.github.com/repos/inyono/athene2/tags","blobs_url":"https://api.github.com/repos/inyono/athene2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/inyono/athene2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/inyono/athene2/git/refs{/sha}","trees_url":"https://api.github.com/repos/inyono/athene2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/inyono/athene2/statuses/{sha}","languages_url":"https://api.github.com/repos/inyono/athene2/languages","stargazers_url":"https://api.github.com/repos/inyono/athene2/stargazers","contributors_url":"https://api.github.com/repos/inyono/athene2/contributors","subscribers_url":"https://api.github.com/repos/inyono/athene2/subscribers","subscription_url":"https://api.github.com/repos/inyono/athene2/subscription","commits_url":"https://api.github.com/repos/inyono/athene2/commits{/sha}","git_commits_url":"https://api.github.com/repos/inyono/athene2/git/commits{/sha}","comments_url":"https://api.github.com/repos/inyono/athene2/comments{/number}","issue_comment_url":"https://api.github.com/repos/inyono/athene2/issues/comments{/number}","contents_url":"https://api.github.com/repos/inyono/athene2/contents/{+path}","compare_url":"https://api.github.com/repos/inyono/athene2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/inyono/athene2/merges","archive_url":"https://api.github.com/repos/inyono/athene2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/inyono/athene2/downloads","issues_url":"https://api.github.com/repos/inyono/athene2/issues{/number}","pulls_url":"https://api.github.com/repos/inyono/athene2/pulls{/number}","milestones_url":"https://api.github.com/repos/inyono/athene2/milestones{/number}","notifications_url":"https://api.github.com/repos/inyono/athene2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/inyono/athene2/labels{/name}","releases_url":"https://api.github.com/repos/inyono/athene2/releases{/id}","created_at":"2015-03-12T04:55:30Z","updated_at":"2015-03-21T17:29:10Z","pushed_at":"2015-07-09T18:18:58Z","git_url":"git://github.com/inyono/athene2.git","ssh_url":"git@github.com:inyono/athene2.git","clone_url":"https://github.com/inyono/athene2.git","svn_url":"https://github.com/inyono/athene2","homepage":"","size":13796,"stargazers_count":0,"watchers_count":0,"language":"PHP","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":"serlo-org:master","ref":"master","sha":"900635be8d38b3e87be6b8888e239938a172f413","user":{"login":"serlo-org","id":3372436,"avatar_url":"https://avatars.githubusercontent.com/u/3372436?v=3","gravatar_id":"","url":"https://api.github.com/users/serlo-org","html_url":"https://github.com/serlo-org","followers_url":"https://api.github.com/users/serlo-org/followers","following_url":"https://api.github.com/users/serlo-org/following{/other_user}","gists_url":"https://api.github.com/users/serlo-org/gists{/gist_id}","starred_url":"https://api.github.com/users/serlo-org/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/serlo-org/subscriptions","organizations_url":"https://api.github.com/users/serlo-org/orgs","repos_url":"https://api.github.com/users/serlo-org/repos","events_url":"https://api.github.com/users/serlo-org/events{/privacy}","received_events_url":"https://api.github.com/users/serlo-org/received_events","type":"Organization","site_admin":false},"repo":{"id":29728912,"name":"athene2","full_name":"serlo-org/athene2","owner":{"login":"serlo-org","id":3372436,"avatar_url":"https://avatars.githubusercontent.com/u/3372436?v=3","gravatar_id":"","url":"https://api.github.com/users/serlo-org","html_url":"https://github.com/serlo-org","followers_url":"https://api.github.com/users/serlo-org/followers","following_url":"https://api.github.com/users/serlo-org/following{/other_user}","gists_url":"https://api.github.com/users/serlo-org/gists{/gist_id}","starred_url":"https://api.github.com/users/serlo-org/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/serlo-org/subscriptions","organizations_url":"https://api.github.com/users/serlo-org/orgs","repos_url":"https://api.github.com/users/serlo-org/repos","events_url":"https://api.github.com/users/serlo-org/events{/privacy}","received_events_url":"https://api.github.com/users/serlo-org/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/serlo-org/athene2","description":"A collaborative, multi tenant learning resources management","fork":false,"url":"https://api.github.com/repos/serlo-org/athene2","forks_url":"https://api.github.com/repos/serlo-org/athene2/forks","keys_url":"https://api.github.com/repos/serlo-org/athene2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/serlo-org/athene2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/serlo-org/athene2/teams","hooks_url":"https://api.github.com/repos/serlo-org/athene2/hooks","issue_events_url":"https://api.github.com/repos/serlo-org/athene2/issues/events{/number}","events_url":"https://api.github.com/repos/serlo-org/athene2/events","assignees_url":"https://api.github.com/repos/serlo-org/athene2/assignees{/user}","branches_url":"https://api.github.com/repos/serlo-org/athene2/branches{/branch}","tags_url":"https://api.github.com/repos/serlo-org/athene2/tags","blobs_url":"https://api.github.com/repos/serlo-org/athene2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/serlo-org/athene2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/serlo-org/athene2/git/refs{/sha}","trees_url":"https://api.github.com/repos/serlo-org/athene2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/serlo-org/athene2/statuses/{sha}","languages_url":"https://api.github.com/repos/serlo-org/athene2/languages","stargazers_url":"https://api.github.com/repos/serlo-org/athene2/stargazers","contributors_url":"https://api.github.com/repos/serlo-org/athene2/contributors","subscribers_url":"https://api.github.com/repos/serlo-org/athene2/subscribers","subscription_url":"https://api.github.com/repos/serlo-org/athene2/subscription","commits_url":"https://api.github.com/repos/serlo-org/athene2/commits{/sha}","git_commits_url":"https://api.github.com/repos/serlo-org/athene2/git/commits{/sha}","comments_url":"https://api.github.com/repos/serlo-org/athene2/comments{/number}","issue_comment_url":"https://api.github.com/repos/serlo-org/athene2/issues/comments{/number}","contents_url":"https://api.github.com/repos/serlo-org/athene2/contents/{+path}","compare_url":"https://api.github.com/repos/serlo-org/athene2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/serlo-org/athene2/merges","archive_url":"https://api.github.com/repos/serlo-org/athene2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/serlo-org/athene2/downloads","issues_url":"https://api.github.com/repos/serlo-org/athene2/issues{/number}","pulls_url":"https://api.github.com/repos/serlo-org/athene2/pulls{/number}","milestones_url":"https://api.github.com/repos/serlo-org/athene2/milestones{/number}","notifications_url":"https://api.github.com/repos/serlo-org/athene2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/serlo-org/athene2/labels{/name}","releases_url":"https://api.github.com/repos/serlo-org/athene2/releases{/id}","created_at":"2015-01-23T10:56:44Z","updated_at":"2015-05-22T12:58:08Z","pushed_at":"2015-07-08T13:30:36Z","git_url":"git://github.com/serlo-org/athene2.git","ssh_url":"git@github.com:serlo-org/athene2.git","clone_url":"https://github.com/serlo-org/athene2.git","svn_url":"https://github.com/serlo-org/athene2","homepage":"","size":14562,"stargazers_count":2,"watchers_count":2,"language":"PHP","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":6,"mirror_url":null,"open_issues_count":14,"forks":6,"open_issues":14,"watchers":2,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/serlo-org/athene2/pulls/141"},"html":{"href":"https://github.com/serlo-org/athene2/pull/141"},"issue":{"href":"https://api.github.com/repos/serlo-org/athene2/issues/141"},"comments":{"href":"https://api.github.com/repos/serlo-org/athene2/issues/141/comments"},"review_comments":{"href":"https://api.github.com/repos/serlo-org/athene2/pulls/141/comments"},"review_comment":{"href":"https://api.github.com/repos/serlo-org/athene2/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/serlo-org/athene2/pulls/141/commits"},"statuses":{"href":"https://api.github.com/repos/serlo-org/athene2/statuses/551efbd3fdbfdce381098b588805570f2f2426b4"}},"merged":false,"mergeable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"commits":1,"additions":19,"deletions":18,"changed_files":10}}