10499 Commits (7253bb334c718c33ec6a32b2d7e011b41e22a461)
 

Author SHA1 Message Date
Stephane Nicoll 7253bb334c Merge branch '1.5.x' 9 years ago
Stephane Nicoll e5e497ec3a Document `@ImportAutoConfiguration#exclude` 9 years ago
Stephane Nicoll 03afa0b7b9 Merge branch '1.5.x' 9 years ago
Stephane Nicoll e44b595c0d Fix merge issue 9 years ago
Andy Wilkinson b113ba5e70 Merge branch '1.5.x' 9 years ago
Andy Wilkinson 84edf0167f Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson e04ace89b9 Fix LinkageError with ExpectedException and FilteredClassPathRunner 9 years ago
Stephane Nicoll 43a4f0d49e Merge branch '1.5.x' 9 years ago
Stephane Nicoll ecafd384b7 Merge branch '1.4.x' into 1.5.x 9 years ago
Stephane Nicoll 9a9c4c75bf Merge pull request #8030 from michael-simons:fix-appendix-b 9 years ago
Michael J. Simons a852c49edd Fix closing parentheses 9 years ago
Stephane Nicoll b29e296383 Merge branch '1.5.x' 9 years ago
Stephane Nicoll d2299555d2 Merge branch '1.4.x' into 1.5.x 9 years ago
Stephane Nicoll ffa6d6d6e0 Improve error message used in TestDatabaseAutoConfiguration 9 years ago
Andy Wilkinson e7ed7efb56 Merge branch '1.5.x' 9 years ago
Andy Wilkinson 6d22e5b733 Merge pull request #7990 from Johannes Edmeier 9 years ago
Andy Wilkinson 3e88c366ec Polish "Avoid property name collisions when serializing AuditEvent to JSON" 9 years ago
Johannes Edmeier fcf36ed091 Avoid property name collisions when serializing AuditEvent to JSON 9 years ago
Andy Wilkinson bf776070c0 Merge branch '1.5.x' 9 years ago
Andy Wilkinson 3fcdd310d3 Upgrade to Neo4j OGM 2.1.1 9 years ago
Andy Wilkinson 3addb4c407 Merge branch '1.5.x' 9 years ago
Andy Wilkinson f93d4a0cbf Add explicit aliases for exclude and excludeName on SpringBootApplication 9 years ago
Stephane Nicoll c54070d142 Merge branch '1.5.x' 9 years ago
Stephane Nicoll c41ff17dd7 Provide relevant default values for Enums 9 years ago
Andy Wilkinson 973b7a118c Merge branch '1.5.x' 9 years ago
Andy Wilkinson c31a2d8101 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 80a1e1ae64 Polishing 9 years ago
Andy Wilkinson 84583d2b8f Merge branch '1.5.x' 9 years ago
Andy Wilkinson 4e70cd2934 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson b7a02e7237 Update TestRestTemplate to apply template handler to URIs 9 years ago
Andy Wilkinson 4548af2966 Merge branch '1.5.x' 9 years ago
Andy Wilkinson 531cf5d4f6 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 6a0fb8e44c Update DevTools' ResourceLoader to delegate to user's custom loader 9 years ago
Phillip Webb 5502fa2936 Merge branch '1.5.x' 9 years ago
Phillip Webb 1d55f5f6cd Merge branch 'gh-7579' into 1.5.x 9 years ago
Phillip Webb 10dbf3c571 Use `@Validated` as trigger for JSR-330 validation 9 years ago
Phillip Webb f42ebe428c Remove JSR-330 configuration annotations 9 years ago
Phillip Webb 0a6456a748 Always use `prefix` config annotation attribute 9 years ago
Phillip Webb 43d432a527 Polish 9 years ago
Phillip Webb d1a8d136a7 Merge branch '1.4.x' into 1.5.x 9 years ago
Phillip Webb b28d537c78 Disable unwanted m2e activations 9 years ago
Stephane Nicoll 58740d7f30 Merge branch '1.5.x' 9 years ago
Stephane Nicoll 158ce3c376 Merge branch '1.4.x' into 1.5.x 9 years ago
Stephane Nicoll b242543545 Backport missing 3rd party starter reference 9 years ago
Stephane Nicoll b3c610c13e Merge branch '1.5.x' 9 years ago
Stephane Nicoll 3cf4d75aaa Merge branch '1.4.x' into 1.5.x 9 years ago
Stephane Nicoll b7d3e91e38 Merge pull request #8014 from larsgrefer:patch-1 9 years ago
Lars Grefer f5d1b7807c Add OkHttp starter reference 9 years ago
Andy Wilkinson aba09cce73 Merge branch '1.5.x' 9 years ago
Andy Wilkinson baeb9c3495 Merge pull request #7902 from Alessandro Falappa 9 years ago