root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
9,156 Commits 23 Branches 348 Tags 286 MiB
Commit Graph

1566 Commits

Author SHA1 Message Date
Andy Wilkinson 8a547facd1 Merge branch '1.5.x' 2016-10-19 10:52:07 +01:00
Andy Wilkinson c9e6aff374 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:51:53 +01:00
Andy Wilkinson 639b0f554d Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK 
Closes gh-7112
 2016-10-19 10:51:42 +01:00
Andy Wilkinson 57450042bb Merge branch '1.5.x' 2016-10-19 10:44:27 +01:00
Andy Wilkinson 7962818294 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:44:20 +01:00
Andy Wilkinson 6ac041c43b Update Thymeleaf 3 related versions in docs and sample 
See gh-6991
Closes gh-7183
 2016-10-19 10:43:38 +01:00
Andy Wilkinson 3dd0b9d59a Merge branch '1.5.x' 2016-10-19 10:37:00 +01:00
Andy Wilkinson 7d68c14d03 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:36:48 +01:00
Raja Dilip Kolli 4b1ddddea3 Update docs on using Thmyeleaf 3 to reference latest version 
Closes gh-7183
 2016-10-19 10:34:11 +01:00
Stephane Nicoll d79546da74 Merge branch '1.5.x' 2016-10-17 17:52:29 +03:00
Stephane Nicoll 6186262ecc Switch `excludeDevtools` to true by default 
Switch the default value of `excludeDevtools` from `false` to `true` as
it is more sensible to exclude such dependency by default.

Closes gh-7170
 2016-10-17 17:52:12 +03:00
Stephane Nicoll d65a843856 Merge branch '1.5.x' 2016-10-12 10:37:38 +02:00
Stephane Nicoll 2d995661f4 Merge branch '1.4.x' into 1.5.x 2016-10-12 10:37:26 +02:00
Stephane Nicoll 00a10bcf61 Restore checkstyle 
Rather than disabling checkstyle altogether, this commit enables it
again, relaxing the javadoc requirement only.

See gh-7142
 2016-10-12 10:37:15 +02:00
Stephane Nicoll d5c3a8ac76 Merge branch '1.5.x' 2016-10-12 10:30:37 +02:00
Stephane Nicoll c6f23000be Merge branch '1.4.x' into 1.5.x 2016-10-12 10:30:19 +02:00
Stephane Nicoll 11cad9e0cb Fix sample in ref doc 
Closes gh-7142
 2016-10-12 10:27:51 +02:00
Stephane Nicoll b0cbe1fdc7 Merge branch '1.5.x' 2016-10-12 10:04:15 +02:00
Stephane Nicoll f254e1227f Merge branch '1.4.x' into 1.5.x 2016-10-12 10:03:59 +02:00
Stephane Nicoll 0d3318796e Merge branch '1.3.x' into 1.4.x 2016-10-12 10:03:41 +02:00
Stephane Nicoll bd2956c3f0 Fix `metricsFilter` reference in doc 
Closes gh-7147
 2016-10-12 10:03:23 +02:00
Stephane Nicoll c5cc626d48 Remove remote shell support 
See gh-7044
 2016-10-11 17:59:25 +02:00
Stephane Nicoll 66a3df454f Merge branch '1.5.x' 2016-10-11 17:42:53 +02:00
Stephane Nicoll cfee9bab81 Deprecate remote shell support 
Closes gh-7044
 2016-10-11 17:39:28 +02:00
Stephane Nicoll 7f2806bd19 Merge branch '1.5.x' 2016-10-11 17:06:04 +02:00
Stephane Nicoll 6fb53f90e5 Polish contribution 
Closes gh-6666
 2016-10-11 17:03:10 +02:00
Stephane Nicoll 92db3b4803 Merge branch '1.5.x' 2016-10-11 08:33:46 +02:00
Stephane Nicoll 18c3d42f45 Merge branch '1.4.x' into 1.5.x 2016-10-11 08:32:43 +02:00
Michael J. Simons e87cf937e1 Add missing parentheses 
Closes gh-7137
 2016-10-11 08:31:44 +02:00
Stephane Nicoll 98f14f2ee9 Polish documentation 
Closes gh-2642
 2016-10-11 08:30:18 +02:00
Stephane Nicoll 097c64a91b Merge branch '1.5.x' 2016-10-10 11:37:51 +02:00
Stephane Nicoll ab2a2579c8 Polish contribution 
Closes gh-6571
 2016-10-10 11:37:21 +02:00
Stephane Nicoll 0480a96166 Merge branch '1.5.x' 2016-10-07 14:21:40 +02:00
Stephane Nicoll 98b30416ca Merge branch '1.4.x' into 1.5.x 2016-10-07 14:21:28 +02:00
Stephane Nicoll 9861cb7e9c Expand the note regarding LiveReload 
See gh-7080
 2016-10-07 14:21:12 +02:00
Stephane Nicoll 3a86e26977 Merge branch '1.5.x' 2016-10-07 14:15:31 +02:00
Stephane Nicoll 5435f03690 Merge branch '1.4.x' into 1.5.x 2016-10-07 14:15:19 +02:00
Aurélien Leboulanger 2c64661b58 Fix typo 
Closes gh-7127
 2016-10-07 14:14:50 +02:00
Stephane Nicoll 5a2eae5628 Merge branch '1.5.x' 2016-10-07 10:35:59 +02:00
Stephane Nicoll ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy 
Closes gh-7113
 2016-10-07 10:35:48 +02:00
Stephane Nicoll b54566c0cd Merge branch '1.5.x' 2016-10-06 13:30:14 +02:00
Stephane Nicoll f82e91df39 Merge branch '1.4.x' into 1.5.x 2016-10-06 13:29:53 +02:00
Stephane Nicoll 03961e6692 Polish contribution 
Closes gh-7004
 2016-10-06 13:28:23 +02:00
Stephane Nicoll 89b1ff1fac Merge branch '1.5.x' 2016-10-06 11:37:35 +02:00
Stephane Nicoll f684bcc9e5 Merge branch '1.4.x' into 1.5.x 2016-10-06 11:37:20 +02:00
Stephane Nicoll 0f97ccf2fa Clarify dependency override instructions for Thymeleaf 3 
Closes gh-7097
 2016-10-06 11:21:24 +02:00
Andy Wilkinson fe10ea73b0 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:58:42 +01:00
Andy Wilkinson ad3e5c04bb Add a second, portal-compatible ID to the Gradle plugin 
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.

This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.

Closes gh-6997
 2016-10-05 14:58:26 +01:00
Andy Wilkinson f137ec6a3a Merge branch '1.5.x' 2016-10-05 14:58:02 +01:00
Andy Wilkinson 846f264da8 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:57:51 +01:00