Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

stable

Clone or download

Read-only

Information is taken into account in the PR view

Download Browse

Part of story #11661 - define a merge strategy for my repositories How to test: - In the repository settigs, set the merge strategy of pull requests on "fast-forward only" - Make a non fast-forward pullrequest to this repository --> The merge zone is in warning mode and the merge button is disabled. Change-Id: I979c3fbce5abd020de4dcf47af0e1abbc80aeda3

+74 −13
Thomas Gorka (tgorka) 2018-08-06 11:55
Thomas Gorka (tgorka) 2018-08-06 13:49
8ee4144cd246e6b15e4745651da626df71ca51b9
012128da15dfa04e82ea051e846b39e14b5d45fa
git #tuleap/stable/8ee4144cd246e6b15e4745651da626df71ca51b9

Modified Files

Side by side diff
Inline diff
Name
M plugins/pullrequest/include/PullRequest/PullRequestPresenter.php +8 −3 Go to diff View file
M plugins/pullrequest/include/pullrequestPlugin.class.php +12 −1 Go to diff View file
R plugins/pullrequest/templates/index.mustache Go to diff View file
M plugins/pullrequest/www/scripts/po/fr.po +18 −5 Go to diff View file
M plugins/pullrequest/www/scripts/po/template.pot +4 −0 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/app-controller.js +3 −0 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/overview/overview-controller.js +2 −1 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/overview/overview.tpl.html +14 −1 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/shared-properties/shared-properties-service.js +13 −2 Go to diff View file