Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-14 17:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,743 Commits 14 Branches 116 Tags
40e36e3f8bb9e279cc9df75fe0c21a19a90b60ce
Commit Graph

111 Commits

Author SHA1 Message Date
Tomofumi Tanaka
6acbd5b2cf Merge remote-tracking branch 'origin/master' into api-support 
Conflicts:
	src/main/scala/ScalatraBootstrap.scala
	src/main/scala/gitbucket/core/controller/AccountController.scala
	src/main/scala/gitbucket/core/controller/ControllerBase.scala
	src/main/scala/gitbucket/core/controller/IssuesController.scala
	src/main/scala/gitbucket/core/controller/PullRequestsController.scala
	src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
	src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
	src/main/scala/gitbucket/core/model/Profile.scala
	src/main/scala/gitbucket/core/service/PullRequestService.scala
	src/main/scala/gitbucket/core/service/WebHookService.scala
	src/main/scala/gitbucket/core/servlet/InitializeListener.scala
	src/main/scala/gitbucket/core/view/helpers.scala
	src/main/twirl/gitbucket/core/pulls/conversation.scala.html
	src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
	src/main/twirl/issues/listparts.scala.html
 2015-03-16 22:49:47 +09:00
nazoking
224e44151f (api-support)change crlf 2015-03-16 00:04:30 +09:00
takezoe
be75cef752 Fix testcase 2015-03-03 02:38:59 +09:00
Naoki Takezoe
d495b04d85 Change package name 2015-03-02 22:15:56 +09:00
nazoking
1e6d26221d show commit status on pull-request-list view 2015-03-02 03:12:26 +09:00
nazoking
597f86dc7b add webhook pull_request synchronize action 2015-03-02 03:12:23 +09:00
nazoking
579ed19949 move api classes to api package 2015-03-02 03:12:22 +09:00
nazoking
9221bfa045 create merge status cache as branch refs/pull/{issueId}/{merge,conflict} 2015-03-02 03:12:21 +09:00
nazoking
3057a31a6c add test for Diretory (set GitBucketHome when test scope) 2015-03-02 03:12:20 +09:00
nazoking
97ceffe689 add CommitStatus table and model and service. 2015-03-02 03:12:11 +09:00
nazoking
4e1094e75b add test 2015-02-27 13:37:48 +09:00
Naoki Takezoe
196890b26f Fix Test 2015-02-20 13:39:47 +09:00
shimamoto
bb3323fb0e Merge pull request #605 from rlazoti/add-connection-pool 
Add Connection Pool
 2015-02-14 22:56:00 +09:00
Mark LaCroix
8643bfeb37 Merge remote-tracking branch 'upstream/master' into anon-access 
Conflicts:
	src/main/scala/app/SystemSettingsController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/test/scala/view/AvatarImageProviderSpec.scala
 2015-01-21 15:49:42 -05:00
Rodrigo Lazoti
172af307a6 add connection pool to Database object 2015-01-20 12:14:28 -02:00
Shintaro Murakami
3233b0ae3c Fix failed test. 2015-01-17 23:28:08 +09:00
Mark LaCroix
48fe7133f7 Add anonymous access option to tests 2015-01-07 09:47:36 -05:00
Shintaro Murakami
b47153e645 Remove old plugin test 2015-01-04 10:40:10 +09:00
Naoki Takezoe
617fcf7c99 Fix compilation error in test 2014-11-22 22:34:27 +09:00
bati11
26b14ded58 Add nested task list support 2014-09-20 10:57:33 +09:00
bati11
937814ec5d Merge branch 'master' into feature-tasklist 
Conflicts:
	src/main/scala/app/IssuesController.scala
	src/main/twirl/issues/create.scala.html
 2014-09-19 12:45:09 +09:00
Naoki Takezoe
8b8bd0289b (refs #464)Fix test case 2014-08-14 22:44:04 +09:00
Naoki Takezoe
55722f87af Fix TestCase 2014-07-31 22:04:52 +09:00
takezoe
723de9e81e Fix TestCase 2014-07-27 22:56:02 +09:00
Tomofumi Tanaka
a2a2e22485 Fix compilation error service test case 2014-07-09 00:25:40 +09:00
Tomofumi Tanaka
c182cde14b Revert "Disable TestCase for Services" 
This reverts commit 104c3bc89d.
 2014-07-08 23:55:15 +09:00
Naoki Takezoe
104c3bc89d Disable TestCase for Services 2014-07-06 17:35:18 +09:00
Naoki Takezoe
0b3781ec8a Add plugin updating capability 2014-06-29 14:26:33 +09:00
bati11
ebb9d9329a Merge branch 'master' into feature-tasklist 2014-05-03 10:51:18 +09:00
takezoe
2fe6b8c1e7 Fix TestCase 2014-04-29 17:02:16 +09:00
Naoki Takezoe
b8b59f9dcd Fix TestCase 2014-04-18 11:10:12 +09:00
Naoki Takezoe
c9fa3291f5 Fix TestCase 2014-04-11 13:23:36 +09:00
bati11
ce79eaada8 Add escapeTaskList method, it escapse '- [] ' characters 2014-04-10 01:21:55 +09:00
takezoe
f5883abf04 Use Context#settings instead of loadSystemSettings() 2014-03-15 04:07:31 +09:00
takezoe
c5ccbf2d1f (refs #115)Fix TestCase 2014-03-14 02:57:31 +09:00
Tomofumi Tanaka
f93ceaa91d (refs #115)Fix typo 2014-03-12 01:01:12 +09:00
takezoe
f78cdb637d (refs #115)Fix TestCase 2014-03-10 01:00:10 +09:00
takezoe
0cfe31ccd9 (refs #115)Fix TestCase 2014-03-08 22:00:36 +09:00
takezoe
049b12b908 Merge branch 'master' into ssh-access 
Conflicts:
	src/main/scala/servlet/GitRepositoryServlet.scala
 2014-03-08 18:59:13 +09:00
Tomofumi Tanaka
07a108760c (refs #115)Use regex to create git command 
And add GitCommandFactory Unit Test Spec
 2014-03-06 23:36:01 +09:00
takezoe
b641bfb56a (refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2 2014-03-06 16:17:41 +09:00
takezoe
b62f7c5aee Fix TestCase 2014-03-06 14:27:49 +09:00
takezoe
b031103df8 (refs #218)Separate StringUtil#extractCloseId() to add unit test. 2014-03-02 04:49:14 +09:00
takezoe
c114a8b507 (refs #279)Fix TestCase. 2014-02-24 02:16:18 +09:00
takezoe
bb9a23fe0f Fix TestCase. 2014-02-20 03:40:06 +09:00
Jeffrey Olchovy
153a32e340 (refs #231)Generate anchors for headers in wiki markup 2014-02-08 13:59:27 -05:00
Jiri Tyr
7174523ac5 Load Gravatar images always through HTTPS 
This patch will force to load Gravatar images always through HTTPS which
will fix the problem with mixed content when accessing the page through
HTTPS.

The problem is that if an HTTPS page includes HTTP content, the HTTP
portion can be read or modified by attackers, even though the main page
is served over HTTPS.
 2013-11-10 00:42:17 +00:00
takezoe
3dec2b8159 Fix test case. 2013-11-03 15:12:01 +09:00
takezoe
bcc2c8cc2d Fix test case. 2013-11-02 05:20:24 +09:00
takezoe
34853d0322 Fix test case. 2013-11-01 12:42:09 +09:00