Naoki Takezoe
2da2b426a1
Merge branch 'master' into solidbase-integration
...
# Conflicts:
# build.sbt
# src/main/twirl/gitbucket/core/main.scala.html
2016-04-12 01:08:59 +09:00
nazoking
91cda6d245
Merge pull request #1144 from distkloc/pull-request-key-in-issues-api
...
Add pull_request key in list issues api if an issue is a pull request
2016-03-10 12:35:48 +09:00
distkloc
a82e579d57
Add pull_request key in list issues api if an issue is a pull request
2016-03-10 02:08:09 +09:00
Naoki Takezoe
9a42b93d1f
Merge pull request #1140 from gitbucket/separate_api_controller
...
Separate API controller to improve routing performance
2016-03-10 01:34:56 +09:00
Naoki Takezoe
539751a1d9
Merge branch 'master' into solidbase-integration
...
# Conflicts:
# build.sbt
# src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
# src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
2016-03-06 13:07:03 +09:00
Naoki Takezoe
876bb396fd
Fix testcase
2016-03-06 03:07:33 +09:00
Naoki Takezoe
1b1bd371a4
Fix testcase
2016-03-05 20:11:04 +09:00
Matthieu Brouillard
356202e28a
integrate xhub4j, fixes #1117
2016-03-02 22:25:21 +01:00
Naoki Takezoe
8145cba111
Merge branch 'wip/baseurl' of https://github.com/ritschwumm/gitbucket into ritschwumm-wip/baseurl
2016-02-12 23:15:59 +09:00
Naoki Takezoe
8fd92f1c2f
Fix compilation error in testcase
2016-02-06 23:39:57 +09:00
Naoki Takezoe
419ea16ead
Remove Specs2 dependency
2016-02-06 22:27:23 +09:00
Naoki Takezoe
e72d808a3c
Migrating testcase to ScalaTest
2016-02-06 22:10:20 +09:00
Naoki Takezoe
44e8c0a9be
Migrating testcase to ScalaTest
2016-02-05 23:00:35 +09:00
Naoki Takezoe
e2c39d7815
Merged branch master into scalatest
2016-02-04 01:51:29 +09:00
Naoki Takezoe
911754e1dc
Migrating testcase to ScalaTest
2016-02-04 00:40:58 +09:00
Naoki Takezoe
0067cbce6f
Fix failed test
2016-02-04 00:37:50 +09:00
Naoki Takezoe
f40f8427aa
Replace === with ==
2016-02-04 00:27:00 +09:00
Naoki Takezoe
bcc05f021c
Migrating testcases to ScalaTest from Specs2
2016-02-02 00:36:08 +09:00
Herr Ritschwumm
a1bacccc09
add tests, failing right now
2016-01-30 16:25:44 +01:00
Herr Ritschwumm
3f2935612d
feature: add settings for the ssh host
2016-01-30 11:15:07 +01:00
Naoki Takezoe
40e36e3f8b
Merge branch 'master'
...
Conflicts:
project/build.scala
2016-01-27 13:35:30 +09:00
lidice
64cacb18a4
Extend API to allow CRUD labels
...
Add Labels API
* List all labels for this repository
* Get a single label
* Create a label
* Update a label
* Delete a label
Reject duplicated label name
Add test case for LabelsService
2016-01-22 07:44:35 +09:00
Naoki Takezoe
1201271949
Merge branch 'master' into solidbase-integration
...
Conflicts:
src/main/scala/gitbucket/core/model/Profile.scala
src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
2016-01-19 15:31:26 +09:00
Naoki Takezoe
206d597d9b
Fix testcase
2016-01-19 12:50:54 +09:00
Naoki Takezoe
1b4c621fef
Change CommitHook to ReceiveHook
2016-01-19 12:26:20 +09:00
Naoki Takezoe
8dcb8c2ecb
Fix testcase
2016-01-17 01:48:56 +09:00
Naoki Takezoe
4abd4a4bac
Merge branch 'feature/protected-branch' of https://github.com/team-lab/gitbucket into team-lab-feature/protected-branch
2016-01-17 00:01:18 +09:00
Naoki Takezoe
f5c1c0703d
Fix compilation error in testcase
2016-01-13 11:47:59 +09:00
Naoki Takezoe
5036b1a1aa
Replace migration system with Solidbase
2016-01-10 01:43:13 +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
6661314be5
Add git proection api and form
2016-01-02 20:20:24 +09:00
Naoki Takezoe
cbb847704b
Fix compilation error in testcase
2016-01-02 03:07:53 +09:00
Naoki Takezoe
4457a317e6
(refs #815 )Upgrade Scalatra to 2.4.0
2015-12-30 05:27:09 +09:00
nazoking
84d97817e3
add comment
2015-11-09 13:57:37 +09:00
nazoking
2c6d2176bb
fix space
2015-11-09 13:57:26 +09:00
nazoking
7840d28ed2
add webhook pull-request-review-comment
2015-11-09 12:20:07 +09:00
nazoking
66b5fe7337
Merge branch 'master' into feature/webhook-scope
2015-11-06 14:48:03 +09:00
Naoki Takezoe
bd9e064137
Merge pull request #925 from team-lab/feature/add-compare-link-for-webhook-push
...
Feature/add properties for webhook push
2015-10-31 02:57:24 +09:00
Tobias Roeser
00cd3adc7b
Refined regex and removed explicit TLDs
...
Also made regex val private.
2015-10-14 22:42:35 +02:00
Tobias Roeser
5a97a518a6
Detect links and render them as HTML links in repo description
2015-10-14 14:41:09 +02:00
nazoking
a08a212fdc
feature/can select webhook events
2015-10-13 18:48:02 +09:00
nazoking
d13bb47ee7
remove ApiPushCommit class (merge to ApiCommit)
2015-10-06 02:27:42 +09:00
nazoking
8b8c6ee861
fix repository.url on webhook push payload
2015-10-06 02:15:03 +09:00
Naoki Takezoe
73cf9661ac
Fix url encoding to encode whitespace to %20
2015-10-03 04:00:08 +09:00
Naoki Takezoe
c5da975cea
Merge pull request #919 from team-lab/fix-push-commit-url
...
fix commit url in webhook `push` event.
2015-10-02 21:13:58 +09:00
nazoking
ace65cf261
(refs #920 ) Remove IssueOrPullRequest. it is too much for this purpose
2015-10-02 11:59:25 +09:00
nazoking
bf64f6b4f4
api url is only issues
2015-10-02 00:33:23 +09:00
nazoking
0283ec574d
fix pull-request url on webhook payload
2015-10-02 00:23:13 +09:00
nazoking
bb9add9da9
fix commit url in push webhook.
2015-10-01 22:56:36 +09:00
