-
-
Notifications
You must be signed in to change notification settings - Fork 545
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Moves to conf-based Assets management (like the scala starter sample) #83
Conversation
@ignasi35, check the java one. Build is failing on the project you changed. |
@@ -4,16 +4,16 @@ | |||
* two arguments, a `String` for the title of the page and an `Html` | |||
* object to insert into the body of the page. | |||
*@ | |||
@(title: String)(content: Html) | |||
@(title: String, assetsFinder: AssetsFinder)(content: Html) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make AssetsFinder
implicit here? I thought that is why you made an implicit
in index.scala.html
above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch. I focused in bringing the Java sample in sync with the Scala one. The issue you highlighted is also present in the Scala sample. I'll have a look at necessary changes (since main
is also used elsewhere) and propagate/sync to the PR of the docs.
|
||
@@main("Welcome to Play") { | ||
|
||
@@play20.welcome(message, style = "Java") | ||
@@welcome(message, style = "Java") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While doing applies changes after the PR comments, I've noticed welcome.scala.html
had yet another copy of the code. I've raised #84 to tackle this never-ending duplication.
?!? @dwijnand did you purposedly change the PR title or is it mergify messing around? |
I didn't purposely change it, but I suspect it's Refined GitHub, not Mergify... |
Looks like a feature interaction. |
…2.6.x Upgrade branch 2.6.x using TemplateControl
``` Updated with template-control on 2019-01-16T12:08:45.678Z /LICENSE: wrote /LICENSE /NOTICE: wrote /NOTICE /.mergify.yml: wrote /.mergify.yml ```
* play-java-ebean-example/2.6.x: (52 commits) Nest play-java-ebean-example Updated with template-control on 2019-02-13T20:25:39.252Z (playframework#96) Upgrade branch 2.6.x using TemplateControl (playframework#94) Upgrade branch 2.6.x using TemplateControl (playframework#93) Upgrade branch 2.6.x using TemplateControl (playframework#92) Updated with template-control on 2019-01-08T14:44:41.376Z (playframework#89) Upgrade branch 2.6.x using TemplateControl (playframework#85) Upgrade branch 2.6.x using TemplateControl (playframework#83) Upgrade branch 2.6.x using TemplateControl (playframework#79) Updated with template-control on 2018-09-11T20:14:50.116Z (playframework#77) Updated with template-control on 2018-08-20T20:37:13.842Z (playframework#76) Updated with template-control on 2018-07-19T01:58:55.623Z (playframework#74) Updated with template-control on 2018-07-16T18:38:45.357Z (playframework#73) Upgrade branch 2.6.x using TemplateControl (playframework#72) Updated with template-control on 2018-05-27T23:54:09.409Z (playframework#71) Updated with template-control on 2018-04-06T19:34:58.195Z (playframework#68) Updated with template-control on 2018-03-02T18:56:28.219Z (playframework#67) Updated with template-control on 2018-01-11T21:32:27.151Z (playframework#64) Fix cross build to sbt 1.1.0 (playframework#63) Updated with template-control on 2018-01-09T20:17:10.839Z (playframework#62) ...
* play-java-jpa-example/2.6.x: (48 commits) Nest play-java-jpa-example Updated with template-control on 2019-02-13T20:25:39.298Z (playframework#87) Upgrade branch 2.6.x using TemplateControl (playframework#85) Upgrade branch 2.6.x using TemplateControl (playframework#84) Upgrade branch 2.6.x using TemplateControl (playframework#83) Updated with template-control on 2019-01-08T14:44:42.531Z (playframework#81) Updated with template-control on 2019-01-04T17:13:23.827Z (playframework#76) Upgrade branch 2.6.x using TemplateControl (playframework#71) Upgrade branch 2.6.x using TemplateControl (playframework#69) Updated with template-control on 2018-09-11T20:14:50.333Z (playframework#65) Updated with template-control on 2018-08-20T20:37:13.878Z (playframework#63) Updated with template-control on 2018-07-19T01:58:55.873Z (playframework#61) Updated with template-control on 2018-07-16T18:38:45.441Z (playframework#60) Upgrade branch 2.6.x using TemplateControl (playframework#59) Updated with template-control on 2018-05-27T23:54:09.603Z (playframework#58) Updated with template-control on 2018-04-06T19:34:58.092Z (playframework#55) Updated with template-control on 2018-03-02T18:56:28.087Z (playframework#54) Upgrade branch 2.6.x using TemplateControl (playframework#53) Fix cross build to sbt 1.1.0 (playframework#52) Upgrade branch 2.6.x using TemplateControl (playframework#51) ...
* play-scala-tls-example/2.6.x: (53 commits) Nest play-scala-tls-example Updated with template-control on 2019-02-13T20:25:39.799Z (playframework#100) Upgrade branch 2.6.x using TemplateControl (playframework#98) Upgrade branch 2.6.x using TemplateControl (playframework#97) Upgrade branch 2.6.x using TemplateControl (playframework#96) Updated with template-control on 2019-01-08T14:44:41.961Z (playframework#93) Updated with template-control on 2019-01-04T21:47:52.378Z (playframework#87) Make Travis CI fast_finish Upgrade branch 2.6.x using TemplateControl (playframework#83) remove array syntax on label conditional check mergify with squash (playframework#79) minor mergify improvements (playframework#78) mergify file (playframework#77) AkkaHttpServer.Context - removed usage of deprecated API (playframework#76) Upgrade branch 2.6.x using TemplateControl (playframework#71) Upgrade branch 2.6.x using TemplateControl (playframework#55) Fix cross build to sbt 1.1.0 (playframework#54) Upgrade branch 2.6.x using TemplateControl (playframework#53) Upgrade branch 2.6.x using TemplateControl (playframework#51) Updated with template-control on 2017-12-21T20:59:17.421Z (playframework#50) ...
related to playframework/playframework#9942 and playframework/playframework#9982