nazoking
f13a3ee580
for bootstrap 3
2016-01-02 20:23:07 +09:00
nazoking
927969ac17
remove println(for debug)
2016-01-02 20:23:07 +09:00
nazoking
2d8aa4f8b5
update button
2016-01-02 20:23:07 +09:00
nazoking
645af4d2c0
add protected-branch feature on pull-request page
...
* show commit-status if context is require status checks to pass.
* disable merge if new commit-id has not `commit-status` ok on `Status-checkes`.
* if some status includes required is not success, merge button is disabled.
* if any required status is success, and some status not includes required, merge button is active, but button color is white.
* if any required status is success, merge button is active, and button color is green.
2016-01-02 20:20:24 +09:00
nazoking
34240d16b5
Protected mark(octicon-shield) on Branches page
2016-01-02 20:20:24 +09:00
nazoking
89210985d4
Readonly on online-editor
2016-01-02 20:20:24 +09:00
nazoking
9d6258861a
add protected branch list on branch setting page.
2016-01-02 20:20:24 +09:00
nazoking
6661314be5
Add git proection api and form
2016-01-02 20:20:24 +09:00
nazoking
e187d026cc
create repository setting branches page and move default branch setting to there.
2016-01-02 20:20:24 +09:00
nazoking
100b34085c
fix 'cannot create a JUnit XML printer. Please check that specs2-junit.jar is on the classpath'
2016-01-02 18:54:56 +09:00
Naoki Takezoe
ba75079409
Fix repository creation error
2016-01-02 03:08:09 +09:00
Naoki Takezoe
cbb847704b
Fix compilation error in testcase
2016-01-02 03:07:53 +09:00
Naoki Takezoe
739c99edce
(refs #970 )Display permission change
2016-01-02 02:42:38 +09:00
Naoki Takezoe
af2e2f5fd1
Merge branch 'viliamjr-wiki-sidebar'
2016-01-01 22:46:31 +09:00
Naoki Takezoe
09fcf9c003
Merge branch 'wiki-sidebar' of https://github.com/viliamjr/gitbucket into viliamjr-wiki-sidebar
...
# Conflicts:
# src/main/twirl/gitbucket/core/wiki/page.scala.html
2016-01-01 22:45:54 +09:00
Naoki Takezoe
5dad0777d7
Deploy assembly jar to snapshot repository if version ends with "-SNAPSHOT"
2016-01-01 19:57:17 +09:00
Naoki Takezoe
be3aa21651
Fix compilation error caused by JGit update
2016-01-01 17:49:32 +09:00
Naoki Takezoe
abd729e45f
Update depended libraries
2016-01-01 17:43:22 +09:00
Naoki Takezoe
162e9a9feb
Update version to 3.11.0-SNAPSHOT
2016-01-01 15:12:06 +09:00
Naoki Takezoe
7500d017d5
Fix dropdown bug
2016-01-01 14:42:08 +09:00
Naoki Takezoe
e8c4004d5a
Remove file appender
2016-01-01 13:13:30 +09:00
Naoki Takezoe
a6f4d9d7cf
Upgrade scalatra-forms to 1.0.0 that supports Scalatra 2.4.0
2015-12-31 02:33:11 +09:00
Naoki Takezoe
3399278925
(refs #738 )Revert content type detection
...
because Scalatra automatic charset detection issue has been fixed in Scalatra 2.4.0.
https://github.com/scalatra/scalatra/pull/500
2015-12-30 10:58:06 +09:00
Naoki Takezoe
4457a317e6
(refs #815 )Upgrade Scalatra to 2.4.0
2015-12-30 05:27:09 +09:00
Naoki Takezoe
990d082422
3.10 release
2015-12-30 01:18:13 +09:00
Naoki Takezoe
dfe3fbc02f
Bump up H2 to 1.4.190
2015-12-29 01:37:52 +09:00
Naoki Takezoe
c077dd0046
Rename logback-test.xml to logback-dev.xml
2015-12-27 14:40:54 +09:00
Naoki Takezoe
9cc6beead7
(refs #990 )Provides path for raw contents instead of ?raw=true
2015-12-26 22:48:28 +09:00
Naoki Takezoe
92f6792ad9
Adjust format
2015-12-26 21:20:09 +09:00
Naoki Takezoe
25031eadfb
Merge pull request #1017 from swaldman/minor-c3p0-tweaks
...
Upgrade c3p0 and tweak default config to avoid Tomcat issues
2015-12-26 17:00:33 +09:00
Naoki Takezoe
a7024615e1
Merge pull request #1020 from P1tt187/sshd-RSA-keyprovider
...
update sshd dependency, rsa keyprovider as default
2015-12-26 16:59:30 +09:00
Naoki Takezoe
8191a4bedb
(refs #1004 )Fix edit webhook link url
2015-12-26 03:25:49 +09:00
Naoki Takezoe
7e1f5aa353
Fix branch control dropdown
2015-12-25 10:26:30 +09:00
Fabian Markert
44e161f6ec
update version
2015-12-24 17:16:20 +01:00
Fabian Markert
7bd17ed038
update sshd dependency
...
migrate to new sshd api
change the default key provider algorithm to RSA
2015-12-24 17:11:40 +01:00
Naoki Takezoe
a47404130b
Don't break lines in Wiki or markdown files on the repository viewer
2015-12-24 02:58:39 +09:00
Naoki Takezoe
669949aa8c
Update docs
2015-12-23 23:30:10 +09:00
Naoki Takezoe
c773bb90f6
Update docs
2015-12-23 23:26:59 +09:00
Naoki Takezoe
18f525523b
Update docs
2015-12-23 23:06:22 +09:00
Naoki Takezoe
3bfd228df1
Update docs
2015-12-23 23:03:32 +09:00
Naoki Takezoe
c072ab2dc5
Update docs
2015-12-23 22:44:20 +09:00
Naoki Takezoe
53e06c5e86
(refs #1018 )Move to xsbt-web-plugin from scalatra-sbt
2015-12-23 21:37:25 +09:00
Steve Waldman
b0a749bdc1
Upgrade c3p0 and tweak default config to avoid Tomcat issues
...
Adds a standard typesafe-config reference.conf file that sets c3p0
config to prevents Tomcat memory leaks on hot-redeploy/shutdown.
See
http://www.mchange.com/projects/c3p0/#configuring_to_avoid_memory_leaks_on_redeploy
http://www.mchange.com/projects/c3p0/#tomcat-specific
This new config can be overridden in an application.conf or
c3p0.properties file.
( See http://www.mchange.com/projects/c3p0/#configuration_precedence )
Updates c3p0 version to c3p0-0.9.5.2, which fixes that leads to
unnecessary String allocation when logging via slf4j.
2015-12-21 22:51:12 -08:00
Naoki Takezoe
809443a46f
Zip logback.xml into the root of gitbucket.war
2015-12-22 07:59:47 +09:00
Naoki Takezoe
59ef44dd71
Update logging configuration
2015-12-22 07:59:15 +09:00
Naoki Takezoe
d77973a29e
Remove IDE plugins and add logback-classic
2015-12-22 07:58:30 +09:00
Naoki Takezoe
be6bc16d3d
Fix global header style
2015-12-21 15:14:51 +09:00
Naoki Takezoe
407e926abe
Fix styles in file editing form in the repository viewer
2015-12-21 15:14:21 +09:00
Naoki Takezoe
117655b011
(refs #1002 )Upgrade markedj to 1.0.6-SNAPSHOT to solve IndexOutOfBoundsException in the table
2015-12-19 12:56:34 +09:00
Naoki Takezoe
2ea4a5a7ef
(refs #1007 )Fix max length constraint for repository owner and name at the repository creation form
2015-12-18 01:46:25 +09:00
