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
2b2ae718f7
Fix preview bug in online editor of repository viewer
2016-01-16 22:37:40 +09:00
Naoki Takezoe
ef201e3319
Update haeding style to bold
2016-01-16 22:37:07 +09:00
Naoki Takezoe
0ab28e6daa
(refs #1031 )Fix issue link processing in Markdown
2016-01-16 22:14:45 +09:00
Naoki Takezoe
9b3e8bd22b
Fix Markdown preview style
...
However styles in markdown-body affect tab. So there are invalid margin at the top of the tab.
2016-01-16 22:00:29 +09:00
Naoki Takezoe
15e8527e01
(refs #984 )Fix special character problem in repository viewer
2016-01-16 14:27:44 +09:00
Naoki Takezoe
f991f3b454
Merge branch 'cubdesign-name-truncate'
2016-01-16 14:18:12 +09:00
Naoki Takezoe
d6a39403e2
(refs #1035 )Fixup
2016-01-16 14:18:03 +09:00
Naoki Takezoe
aa065fd030
Merge branch 'name-truncate' of https://github.com/cubdesign/gitbucket into cubdesign-name-truncate
2016-01-16 14:15:42 +09:00
Naoki Takezoe
b1b132dfc3
Merge pull request #1029 from team-lab/add-jrebel
...
Add jrebel
2016-01-15 01:23:41 +09:00
Naoki Takezoe
90c379b3b9
Update README.md
2016-01-13 14:01:40 +09:00
Naoki Takezoe
b71ff6f179
Update README.md
2016-01-13 13:55:59 +09:00
Takeo Tamura
f63542dbd0
delete white-space
2016-01-07 16:55:39 +09:00
Takeo Tamura
63e605d99c
fix long file name text-overflow
2016-01-07 16:54:08 +09:00
Takeo Tamura
9e313bb2b3
fix long file name text-overflow
2016-01-07 16:40:44 +09:00
Naoki Takezoe
a03fc4cf4a
Merge pull request #1032 from cubdesign/issues-badge
...
show side menu badge
2016-01-06 23:09:03 +09:00
Naoki Takezoe
d18f92cfbf
Merge pull request #1033 from cubdesign/issues-pagination
...
fix pagination layout
2016-01-06 23:05:33 +09:00
Takeo Tamura
b96821ca44
fix pagination layout
2016-01-06 22:16:52 +09:00
Takeo Tamura
c61ecdef7a
show badge
2016-01-06 22:07:20 +09:00
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
nazoking
5fd87ca764
add jrebel document
2016-01-03 22:46:15 +09:00
nazoking
1042c50cc3
add jrebel plugin
2016-01-03 22:09:52 +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
Naoki Takezoe
a3b3262ad5
Merge pull request #1026 from team-lab/fix/test-merge-service-more-likely-to-succeed
...
MergeServiceSpec more likely to succeed
2016-01-03 00:43:45 +09:00
Naoki Takezoe
9efba82e94
Merge pull request #1024 from team-lab/fix/test-specs2-junit
...
fix test ( add specs2-junit )
2016-01-02 23:41:51 +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
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