Commit Graph

3849 Commits

Author SHA1 Message Date
Naoki Takezoe
be3fc923fc Remove unnecessary file 2017-02-25 06:46:03 +09:00
Naoki Takezoe
684cd714e5 Update README.md 2017-02-25 06:19:47 +09:00
Naoki Takezoe
ea498f269e 4.10 release 4.10 2017-02-25 06:13:57 +09:00
Naoki Takezoe
98b6d16de7 (refs #1461)Fix mail link rendering in markdown 2017-02-24 01:17:13 +09:00
Naoki Takezoe
4bcfe837b1 (refs #1438) Fix repository viewer for annotated tag 2017-02-21 14:35:30 +09:00
Naoki Takezoe
5721cbf6f4 (refs #1390)Fix permission control in attachment to wiki page 2017-02-21 11:00:21 +09:00
Naoki Takezoe
200760cc56 Merge pull request #1459 from xuwei-k/mock-package-warning
fix deprecation warnings
2017-02-20 12:47:00 +09:00
Naoki Takezoe
28f77e7357 Merge pull request #1460 from xuwei-k/JsonParseException-warn
fix deprecation warning
2017-02-20 12:46:47 +09:00
xuwei-k
c0d9689022 fix deprecation warning
https://github.com/FasterXML/jackson-core/blob/jackson-core-2.8.4/src/main/java/com/fasterxml/jackson/core/JsonParseException.java#L31
2017-02-20 11:45:09 +09:00
xuwei-k
7f436831fe fix deprecation warnings
https://github.com/scalatest/scalatest/blob/release-3.0.0/scalatest/src/main/scala/org/scalatest/mock/package.scala#L38
2017-02-20 11:34:02 +09:00
Naoki Takezoe
96360f1266 Merge pull request #1458 from xuwei-k/remove-scala-java8-compat
remove scala-java8-compat
2017-02-20 11:26:33 +09:00
Naoki Takezoe
4eb31b9ecc Merge pull request #1457 from xuwei-k/Scala-2.12.1
Scala 2.12.1
2017-02-20 11:26:05 +09:00
kenji yoshida
1e24cc4daf remove scala-java8-compat
I have added this for new Java8 backend.
https://github.com/gitbucket/gitbucket/commit/2bcab3052964343a54d79357c04
I think no longer needed because githbucket updated Scala 2.12.
2017-02-20 10:56:18 +09:00
xuwei-k
cf64f9e64f Scala 2.12.1 2017-02-20 10:51:26 +09:00
Naoki Takezoe
a538d030e9 Shutdown ActorSystem which is used for Quartz scheduler in application destroying 2017-02-20 10:40:14 +09:00
Naoki Takezoe
b13e70e787 Merge remote-tracking branch 'origin/master' 2017-02-20 10:12:14 +09:00
Naoki Takezoe
aacfb091b2 Improve textarea resizing 2017-02-20 10:11:53 +09:00
Naoki Takezoe
768a3b1756 Improve textarea resizing 2017-02-20 10:11:26 +09:00
Naoki Takezoe
925408db31 Merge pull request #1381 from gitbucket/scala-2.12
Scala 2.12 support
2017-02-18 16:54:31 +09:00
Naoki Takezoe
31e0c6aa1d (refs #1431) Update default branch if repository is empty and pushed branch is not current default branch 2017-02-18 16:28:14 +09:00
Naoki Takezoe
4de80c3027 Merge pull request #1455 from JLofgren/1454-pr-text-fix
(refs #1454) Clarify text for PR permission settings
2017-02-18 15:07:11 +09:00
John Lofgren
2b986609bf (refs #1454) Clarify text for PR permission settings 2017-02-15 23:17:51 -05:00
Naoki Takezoe
43b932304d (refs #1426)Don't redirect non git clients to GitHub like repository URL 2017-02-16 03:01:33 +09:00
Naoki Takezoe
fcc015a0f8 Correct text 2017-02-16 02:44:32 +09:00
kenji yoshida
67eaf19add Fix typo 2017-02-15 22:07:30 +09:00
Naoki Takezoe
3008b51dbe (refs #1454)Fix typo 2017-02-15 22:00:51 +09:00
Naoki Takezoe
ee65ae3e49 Tweak directory processing 2017-02-14 16:57:51 +09:00
Naoki Takezoe
da64cf8800 Merge pull request #1453 from shiena/move_lfs_dir
Failure to clone LFS file when repository rename or transfer
2017-02-14 16:36:19 +09:00
Mitsuhiro Koga
ca0302723d Delete if parent folder is empty 2017-02-14 13:02:20 +09:00
Mitsuhiro Koga
026f5e2f26 Also move the LFS directory 2017-02-14 12:14:40 +09:00
Naoki Takezoe
ea4414f1a5 Bump blocking-slick to 0.0.7 2017-02-12 23:12:27 +09:00
Naoki Takezoe
53977bdf80 Merge pull request #1448 from peccu/patch-2
Add "owner" to notification subject
2017-02-12 20:50:00 +09:00
Naoki Takezoe
952d1954d9 Merge pull request #1452 from shiena/display-file-size
Display file size in file viewer
2017-02-12 20:48:43 +09:00
Mitsuhiro Koga
fbd34dc89f Apply label style to file size 2017-02-12 14:38:56 +09:00
Naoki Takezoe
79d41ba57b Bump blocking-slick 2017-02-12 11:37:04 +09:00
Mitsuhiro Koga
ab1adc48f8 Move readableSize to view helpers 2017-02-12 01:53:25 +09:00
Mitsuhiro Koga
422eda927e Display file size in file viewer 2017-02-11 23:51:37 +09:00
Mitsuhiro Koga
39e55bde2d Add file size to ContentInfo 2017-02-11 23:49:55 +09:00
Mitsuhiro Koga
6ec533990f Extract method to getLfsObjects 2017-02-11 23:47:14 +09:00
Naoki Takezoe
7a6a2471b1 Fix issues sorting 2017-02-10 01:55:34 +09:00
Naoki Takezoe
7d9f308492 Cleaned up code around webhook 2017-02-08 14:51:20 +09:00
Naoki Takezoe
e8888ac191 Fix import statements 2017-02-08 14:23:38 +09:00
Naoki Takezoe
afad27ee01 Bump to blocking-slick 0.0.6 2017-02-08 02:12:26 +09:00
peccu
1ed8e287b3 Add owner to notification subject 2017-02-07 13:39:53 +09:00
Naoki Takezoe
202f56b6a0 Bump blocking-slick 2017-02-06 14:25:25 +09:00
Naoki Takezoe
e72a192e4a Merge branch 'master'
Conflicts:
	build.sbt
	src/main/scala/gitbucket/core/model/CommitStatus.scala
	src/main/scala/gitbucket/core/service/CommitStatusService.scala
	src/main/scala/gitbucket/core/service/CommitsService.scala
	src/main/scala/gitbucket/core/service/IssuesService.scala
	src/main/scala/gitbucket/core/service/RepositoryService.scala
	src/main/scala/gitbucket/core/util/Notifier.scala
2017-02-06 10:32:29 +09:00
Naoki Takezoe
d3afb35fb0 Merge pull request #1445 from kounoike/pr-404
404 for non-implemented api
2017-02-06 09:34:50 +09:00
KOUNOIKE Yuusuke
306c9e45be return 404 for non-implemented api calls 2017-02-04 16:14:23 +09:00
Naoki Takezoe
fd8add4fcd (refs #1439)Fix pattern matching for assemble GitLFS URL 2017-02-01 08:03:02 +09:00
Naoki Takezoe
5a510d5703 (refs #1439)Fix path extraction for GitLFS 2017-02-01 07:13:58 +09:00