Naoki Takezoe
b50ca63c2b
Merge pull request #1030 from team-lab/fix/image-diff
...
Fix/image diff
2016-01-05 01:09:15 +09:00
Naoki Takezoe
f6624c0002
Merge pull request #1027 from moccos/add_path_to_title
...
Add path and branch name to the page title
2016-01-05 01:07:47 +09:00
nazoking
d62fc6e135
fix image-diff style
2016-01-04 20:17:52 +09:00
nazoking
926c4d948f
remove debug info
2016-01-04 17:11:53 +09:00
moccos
adff36c44b
Use repository.repository.defaultBranch instead of "master"
2016-01-03 20:02:27 +09:00
moccos
e8f6d2b990
Add path and branch name to the page title
2016-01-03 05:00:02 +09:00
nazoking
781d465f8d
MergeServiceSpec more likely to succeed
2016-01-02 20:58:44 +09:00
nazoking
766867f341
add test
2016-01-02 20:41:23 +09:00
nazoking
e237a44f56
move MergeStatus to service
2016-01-02 20:23:07 +09:00
nazoking
249430449b
use common mapper
2016-01-02 20:23:07 +09:00
nazoking
73d935efe3
fix typo
2016-01-02 20:23:07 +09:00
nazoking
79251ef1d1
updete bootstrap 3
2016-01-02 20:23:07 +09:00
nazoking
1081c0f16c
remove blank line from basic-template
2016-01-02 20:23:07 +09:00
nazoking
3302b607f1
use real database
2016-01-02 20:23:07 +09:00
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
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
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
be3aa21651
Fix compilation error caused by JGit update
2016-01-01 17:49:32 +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
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
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
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
59ef44dd71
Update logging configuration
2015-12-22 07:59:15 +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
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
Naoki Takezoe
30b0279efe
(refs #1005 )Fix typo
2015-12-18 01:40:32 +09:00
