stable
Clone or download
Read-only
Merge commit 'refs/changes/76/5176/3' of ssh://gerrit.tuleap.net:29418/tuleap into stable
* ssh://gerrit.tuleap.net:29418/tuleap: story #8826: give additional help in the git clone bar helper story #8826: Merge and abandon pull requests
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | plugins/git/include/GitPresenters/RepositoryClonePresenter.class.php | +5 | −1 | Go to diff View file |
| M | plugins/git/include/GitViews/ShowRepo/Content.class.php | +17 | −3 | Go to diff View file |
| M | plugins/git/include/constants.php | +9 | −0 | Go to diff View file |
| M | plugins/git/templates/repository_clone.mustache | +4 | −5 | Go to diff View file |
| M | plugins/git/www/themes/default/css/style.less | +23 | −12 | Go to diff View file |
| A | plugins/pullrequest/include/PullRequest/AdditionalHelpTextPresenter.php | +57 | −0 | Go to diff View file |
| M | plugins/pullrequest/include/autoload.php | +3 | −2 | Go to diff View file |
| M | plugins/pullrequest/include/pullrequestPlugin.class.php | +17 | −1 | Go to diff View file |
| M | plugins/pullrequest/site-content/en_US/pullrequest.tab | +6 | −0 | Go to diff View file |
| M | plugins/pullrequest/site-content/fr_FR/pullrequest.tab | +6 | −0 | Go to diff View file |
| A | plugins/pullrequest/templates/additional-help-text.mustache | +14 | −0 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/po/fr.po | +5 | −0 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/po/template.pot | +5 | −0 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/file-diff/file-diff-rest-service.js | +3 | −0 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/pull-request/comments/comments-rest-service.js | +4 | −0 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/pull-request/files/files-rest-service.js | +3 | −0 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/pull-request/pull-request-controller.js | +9 | −16 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/pull-request/pull-request-rest-service.js | +10 | −12 | Go to diff View file |
| A | plugins/pullrequest/www/js/angular/src/app/pull-request/pull-request-service.js | +37 | −0 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/pull-request/pull-request.tpl.html | +4 | −4 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/pull-requests/pull-requests-controller.js | +5 | −2 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/pull-requests/pull-requests-rest-service.js | +3 | −0 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/pull-requests/pull-requests.less | +34 | −5 | Go to diff View file |
| M | plugins/pullrequest/www/js/angular/src/app/pull-requests/pull-requests.tpl.html | +8 | −4 | Go to diff View file |
| M | plugins/pullrequest/www/themes/FlamingParrot/css/style.less | +5 | −0 | Go to diff View file |
| M | plugins/pullrequest/www/themes/default/css/style.less | +6 | −0 | Go to diff View file |