from pull-request 1370

* refs/heads/issue-1901:
  add function that is visibility of code related options

Reviewed-by: 채수원 

Conflicts:
	app/controllers/CodeApp.java
	app/playRepository/GitRepository.java

* 'folder-jumping' of https://github.com/sanxiyn/yobi:
  Implement folder jumping

Reviewed-by: Yi EungJun 

from pull-request 1425

* refs/heads/issue-1981:
  Renamed _onChangeBranch to _checkMergeResult
  Fixed to check state for only open pull-request

Reviewed-by: 이응준 

* 'copy-and-paste' of https://github.com/sanxiyn/yobi:
  Fix copy-and-paste in SVNRepository.java

Reviewed-by: Yi EungJun 

* 'master' of https://github.com/oh4851/yobi:
  그룹 이름 변경 시 예외가 발생합니다. issue #810

Reviewed-by: insanehong 
Reviewed-by: Yi EungJun 

from pull-request 1412

* refs/heads/issue-1849:
  fixes `Assign to me` and `Create by me` on issue view.

Reviewed-by: 채수원 

* Issue

When one user is not a project member and manager and is a group member or manager, `Assign to me` and `Create by me` do not work. Because current user is not listed on assignee's and author's combo box.

* Solution

Current user will be listed on assignee's and author's combo box.

Private-issue: 1849

* This commit prevents checking merge state for closed or already merged pull-requests.

from pull-request 1415

* refs/heads/issue-956:
  fixes a bug that current user avatar is not shown on project list.

Reviewed-by: 백기선 
Reviewed-by: 이응준 

from pull-request 1424

* refs/heads/remove-warning-message:
  Added SerialVersionUID to PermissionDeniedException

Reviewed-by: 이응준 

* This commit will remove warning message caused by nonexistence of
the SerialVersionUID in a Serializeble class.

from pull-request 1422

* refs/heads/fix/travis-config-for-play-2.3:
  Fix travis config for play 2.3

Reviewed-by: 백기선 

from pull-request 1418

* refs/heads/fix/at-character-in-email-address:
  user: Fix a bug that cannot send password-reset email

Reviewed-by: 백기선 

from pull-request 1420

* refs/heads/issue-1980:
  Added latest h2 dependency

Reviewed-by: 이응준 

* Yobi users who upgraded to Play 2.3.x will have a problem when running the Yobi with a bug
which is originated from H2 1.3.175v (https://code.google.com/p/h2database/issues/detail?id=543)
* Added H2's the latest version 1.4.184 to build.sbt,
and It works well without editing PlayFramework modules's dependency files.

* As the latest version of H2 suggests, you may have to update application.conf's 'db.default.url' value
to not to use implicit relative path.
* If you use implicit relative path, then you have to change it to use explicite relative path like this:
jdbc:h2:file:yobi;MODE=PostgreSQL -> jdbc:h2:file:~/yobi;MODE=PostgreSQL

from pull-request 1416

* refs/heads/fix/markdown-test:
  Fix the failure of MarkdownAppTest

Reviewed-by: 백기선 

'@' character in email address causes an exception. This bug is same
with the bug fixed by 117d9e8.

This bug is reported from https://github.com/naver/yobi/issues/836

CallAction should be called after the app starts.

This test seems to be broken since we start to use play-2.3. I wonder
why this test passed when we used play-2.1.

from pull-request 1404

* refs/heads/issue-1951:
  Fixed a bug for getting notification events

Reviewed-by: 이응준 

from pull-request 1357

* refs/heads/issue-1018:
  add "minLength" option in yobi.ui.Typeahead

Reviewed-by: 채수원 

* ArrayIndexOutOfBoundsException can be occurred if a user's notifications are smaller then
the size of notifications to get.
* This prevents the exception and the user will not see error page.

from pull-request 1377

* refs/heads/upgrade/play-2.3:
  Upgrade Play from 2.2.6 to 2.3.6
  ProjectApp: Fix the incorrect status code for label
  test: Fix url encoding bug
  test: Fix RuntimeExceptions
  Upgrade Play from 2.1.0 to 2.2.6

Reviewed-by: 이희구