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

Migrate merge and error modals

Download Browse

Part of story #10410 - Have burning parrot pull requests How to test: --> Error modal should be properly displayed when there is an error (#protip: to get one, load the closed PRs from the homepage, then click on a pull request, go back using the browser's button -> "Oh snap!"). --> Merge modal is displayed properly --> The merge is done when you click on "continue merging" --> The PR is not merged if you cancel Change-Id: I5f2a72058d1445a7e8c634976cef4c86a46fa315

+139 −79
Thomas Gorka (tgorka) 2018-08-23 12:15
Thomas Gorka (tgorka) 2018-08-23 13:00
6f22425017e16211bbb84bdb24082a74d3a18520
8b071b6661345ce30b7baa82358a807d9974b17a
git #tuleap/stable/6f22425017e16211bbb84bdb24082a74d3a18520

Modified Files

Side by side diff
Inline diff
Name
M plugins/pullrequest/www/scripts/po/fr.po +6 −1 Go to diff View file
M plugins/pullrequest/www/scripts/po/template.pot +5 −0 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/app.js +3 −4 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/error-modal/error-modal-controller.js +3 −8 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/error-modal/error-modal-service.js +23 −17 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/error-modal/error-modal.tpl.html +34 −14 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/overview/_overview.scss +0 −1 Go to diff View file
D plugins/pullrequest/www/scripts/src/app/overview/merge-modal/_merge-modal.scss +0 −5 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/overview/merge-modal/merge-modal-controller.js +8 −6 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/overview/merge-modal/merge-modal-service.js +19 −7 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/overview/merge-modal/merge-modal.tpl.html +21 −9 Go to diff View file
M plugins/pullrequest/www/scripts/src/app/overview/overview-controller.js +12 −5 Go to diff View file
M plugins/pullrequest/www/scripts/webpack.config.js +4 −2 Go to diff View file
M tools/utils/scripts/webpack-aliases.js +1 −0 Go to diff View file