]> source.dussan.org Git - gitblit.git/log
gitblit.git
10 years agoDocumentation
James Moger [Sun, 9 Mar 2014 15:08:03 +0000 (11:08 -0400)]
Documentation

10 years agoMerge pull request #160 from Mrbytes/master
James Moger [Sun, 9 Mar 2014 14:55:13 +0000 (10:55 -0400)]
Merge pull request #160 from Mrbytes/master

Updated esES translation; last string

10 years agoUpdated esES translation; last string 160/head
mrbytes [Sun, 9 Mar 2014 14:38:47 +0000 (15:38 +0100)]
Updated esES translation; last string

10 years agoMerge pull request #159 from kwoot/nl-update
James Moger [Sun, 9 Mar 2014 14:06:10 +0000 (10:06 -0400)]
Merge pull request #159 from kwoot/nl-update

dutch translation of string

10 years agoMerge pull request #158 from yin8086/ChineseTrans
James Moger [Sun, 9 Mar 2014 14:05:52 +0000 (10:05 -0400)]
Merge pull request #158 from yin8086/ChineseTrans

add a Chinese translate string

10 years agoMerge pull request #157 from ds5apn/master
James Moger [Sun, 9 Mar 2014 14:05:25 +0000 (10:05 -0400)]
Merge pull request #157 from ds5apn/master

Added Korean translation gb.mergeToDescription and improved some strings

10 years agodutch translation of string 159/head
Jeroen Baten [Sun, 9 Mar 2014 07:57:35 +0000 (08:57 +0100)]
dutch translation of string

10 years agoadd a Chinese translate string 158/head
Stardrad Yin [Sun, 9 Mar 2014 06:58:15 +0000 (14:58 +0800)]
add a Chinese translate string

10 years agoAdded Korean translation gb.mergeToDescription and improved some strings 157/head
Dongsu, KIM [Sun, 9 Mar 2014 03:12:59 +0000 (12:12 +0900)]
Added Korean translation gb.mergeToDescription and improved some strings

10 years agoListen for git daemon and fanout clients on all intefaces, by default
James Moger [Sun, 9 Mar 2014 01:44:16 +0000 (20:44 -0500)]
Listen for git daemon and fanout clients on all intefaces, by default

10 years agoAllow configuring the default integration branch for a repository
James Moger [Sat, 8 Mar 2014 20:39:36 +0000 (15:39 -0500)]
Allow configuring the default integration branch for a repository

10 years agoMerge pull request #156 from Mrbytes/master
James Moger [Sat, 8 Mar 2014 17:32:48 +0000 (12:32 -0500)]
Merge pull request #156 from Mrbytes/master

Updated esES translation

10 years agoDisable vote & watch links if repository is not accepting ticket updates
James Moger [Sat, 8 Mar 2014 17:24:36 +0000 (12:24 -0500)]
Disable vote & watch links if repository is not accepting ticket updates

10 years agoDocumentation
James Moger [Sat, 8 Mar 2014 17:15:19 +0000 (12:15 -0500)]
Documentation

10 years agoMerge branch 'master' of https://github.com/gitblit/gitblit 156/head
mrbytes [Sat, 8 Mar 2014 17:10:58 +0000 (18:10 +0100)]
Merge branch 'master' of https://github.com/gitblit/gitblit

10 years agoUpdated esES translation 155/head
mrbytes [Sat, 8 Mar 2014 17:05:55 +0000 (18:05 +0100)]
Updated esES translation

10 years agoPrevent Lucene queries from starting with a conjunction
James Moger [Sat, 8 Mar 2014 16:59:18 +0000 (11:59 -0500)]
Prevent Lucene queries from starting with a conjunction

10 years agoFix integration branch in propose instructions
James Moger [Sat, 8 Mar 2014 16:53:38 +0000 (11:53 -0500)]
Fix integration branch in propose instructions

10 years agoAllow selection of integration branch in new ticket page
James Moger [Sat, 8 Mar 2014 16:53:01 +0000 (11:53 -0500)]
Allow selection of integration branch in new ticket page

10 years agoMove Gitblit branches to refs/meta/gitblit
James Moger [Sat, 8 Mar 2014 16:27:00 +0000 (11:27 -0500)]
Move Gitblit branches to refs/meta/gitblit

10 years agoMerge pull request #154 from kwoot/nl-update
James Moger [Sat, 8 Mar 2014 14:19:01 +0000 (09:19 -0500)]
Merge pull request #154 from kwoot/nl-update

dutch translations.

10 years agoMerge pull request #153 from yin8086/ChineseTrans
James Moger [Sat, 8 Mar 2014 14:18:17 +0000 (09:18 -0500)]
Merge pull request #153 from yin8086/ChineseTrans

add Chinese strings

10 years agoMerge pull request #152 from ds5apn/master
James Moger [Sat, 8 Mar 2014 14:17:58 +0000 (09:17 -0500)]
Merge pull request #152 from ds5apn/master

Added new strings to Korean translations

10 years agodutch translations. 154/head
Jeroen Baten [Sat, 8 Mar 2014 07:40:02 +0000 (08:40 +0100)]
dutch translations.
why the original shows up, I have no idea

10 years agoadd Chinese strings 153/head
Stardrad Yin [Sat, 8 Mar 2014 06:46:57 +0000 (14:46 +0800)]
add Chinese strings

10 years agoadded another string to Korean translations 152/head
Dongsu, KIM [Sat, 8 Mar 2014 05:36:59 +0000 (14:36 +0900)]
added another string to Korean translations

10 years agoReplaced uploading to GoogleCode with uploading to Bintray on release
James Moger [Fri, 7 Mar 2014 22:40:07 +0000 (17:40 -0500)]
Replaced uploading to GoogleCode with uploading to Bintray on release

10 years agoFix 'head' vs 'HEAD' commit resolution
James Moger [Fri, 7 Mar 2014 20:25:08 +0000 (15:25 -0500)]
Fix 'head' vs 'HEAD' commit resolution

10 years agoFix NPE in bugtraq processor
James Moger [Fri, 7 Mar 2014 20:15:52 +0000 (15:15 -0500)]
Fix NPE in bugtraq processor

10 years agoDisplay an explanation in ticket page if the user can't propose commits
James Moger [Fri, 7 Mar 2014 19:59:02 +0000 (14:59 -0500)]
Display an explanation in ticket page if the user can't propose commits

10 years agoConditionally hide the propose patchset instructions
James Moger [Fri, 7 Mar 2014 19:28:12 +0000 (14:28 -0500)]
Conditionally hide the propose patchset instructions

There are a few scenarios where a ticket without a patchset should not
display propose instructions.

1. the ticket is resolved
2. the repository is configured to reject new patchsets or is read-only
3. the server is configured to reject new patchsets

10 years agoFix NPE in the Edit Ticket page
James Moger [Fri, 7 Mar 2014 17:23:23 +0000 (12:23 -0500)]
Fix NPE in the Edit Ticket page

10 years agoDocumentation
James Moger [Fri, 7 Mar 2014 12:55:03 +0000 (07:55 -0500)]
Documentation

10 years agoDo not send ticket emails to disabled users
James Moger [Fri, 7 Mar 2014 12:54:14 +0000 (07:54 -0500)]
Do not send ticket emails to disabled users

10 years agoRemove garbage from a bad squash & cherry-pick
James Moger [Fri, 7 Mar 2014 12:52:58 +0000 (07:52 -0500)]
Remove garbage from a bad squash & cherry-pick

10 years agoMerge pull request #151 from yin8086/ChineseTrans
James Moger [Fri, 7 Mar 2014 03:08:57 +0000 (22:08 -0500)]
Merge pull request #151 from yin8086/ChineseTrans

fix some Chinese translations due to some special characters.

10 years agofix some Chinese translations due to some special characters. 151/head
Stardrad Yin [Fri, 7 Mar 2014 02:03:42 +0000 (10:03 +0800)]
fix some Chinese translations due to some special characters.

10 years agoDocumentation
James Moger [Fri, 7 Mar 2014 00:14:02 +0000 (19:14 -0500)]
Documentation

10 years agoDo not use @Inject on the ticket service constructors
James Moger [Thu, 6 Mar 2014 23:02:42 +0000 (18:02 -0500)]
Do not use @Inject on the ticket service constructors

10 years agoExclude title, body, and status fields from initial proposal email
James Moger [Thu, 6 Mar 2014 21:55:45 +0000 (16:55 -0500)]
Exclude title, body, and status fields from initial proposal email

10 years agoDocumentation
James Moger [Thu, 6 Mar 2014 21:15:09 +0000 (16:15 -0500)]
Documentation

10 years agoDocumentation and clarify git workflows
James Moger [Thu, 6 Mar 2014 20:53:20 +0000 (15:53 -0500)]
Documentation and clarify git workflows

10 years agoAllow resolve for proposal workflows
James Moger [Thu, 6 Mar 2014 19:40:08 +0000 (14:40 -0500)]
Allow resolve for proposal workflows

10 years agoUpdate contributors list
James Moger [Thu, 6 Mar 2014 19:39:32 +0000 (14:39 -0500)]
Update contributors list

10 years agoFixed bug in merge: improper use of force and failing on FORCED result
James Moger [Thu, 6 Mar 2014 19:32:08 +0000 (14:32 -0500)]
Fixed bug in merge: improper use of force and failing on FORCED result

10 years agoUpdated the Dutch translation for 1.4.0
Jeroen Baten [Fri, 4 Jan 2013 15:56:08 +0000 (16:56 +0100)]
Updated the Dutch translation for 1.4.0

10 years agoMerged #22 "Tie mirroring, pushing, and the BranchTicketService together"
James Moger [Thu, 6 Mar 2014 18:49:02 +0000 (12:49 -0600)]
Merged #22 "Tie mirroring, pushing, and the BranchTicketService together"

10 years agoDocument ticket replication, mirroring, and advanced administration 22/22/1
James Moger [Thu, 6 Mar 2014 18:39:11 +0000 (13:39 -0500)]
Document ticket replication, mirroring, and advanced administration

10 years agoImprove the GO reindex-tickets shell scripts
James Moger [Thu, 6 Mar 2014 18:38:44 +0000 (13:38 -0500)]
Improve the GO reindex-tickets shell scripts

10 years agoAdd and document REINDEX_TICKETS rpc request type
James Moger [Thu, 6 Mar 2014 18:38:12 +0000 (13:38 -0500)]
Add and document REINDEX_TICKETS rpc request type

10 years agoRevise push/mirror tickets branch triggering
James Moger [Thu, 6 Mar 2014 18:36:23 +0000 (13:36 -0500)]
Revise push/mirror tickets branch triggering

10 years agoMerge pull request #148 from yin8086/ChineseTrans
James Moger [Thu, 6 Mar 2014 12:42:47 +0000 (07:42 -0500)]
Merge pull request #148 from yin8086/ChineseTrans

Add and fix Chinese translations

10 years agoMerge pull request #149 from ds5apn/master
James Moger [Thu, 6 Mar 2014 12:41:10 +0000 (07:41 -0500)]
Merge pull request #149 from ds5apn/master

fixed some Korean translations

10 years agocorrect some translations 149/head
Dongsu, KIM [Thu, 6 Mar 2014 10:28:56 +0000 (19:28 +0900)]
correct some translations

10 years agoFire an event on received ticket branch updates to trigger reindex
James Moger [Thu, 6 Mar 2014 02:50:16 +0000 (21:50 -0500)]
Fire an event on received ticket branch updates to trigger reindex

It would be useful to be able to push a complete repository with a
refs/gitblit/tickets branch and have Gitblit index all those tickets.
Additionally, it would be nice for the mirroring service to recognize
an incoming update to this ref and fire an event that can be processed
by the BranchTicketService, if so configured, to reindex the tickets.

10 years agoAdd Chinese translations for new strings, and fix translations based on online page... 148/head
Stardrad Yin [Thu, 6 Mar 2014 02:45:43 +0000 (10:45 +0800)]
Add Chinese translations for new strings, and fix translations based on online page views of dev.gitblit.com

10 years agoUpdate to JGit 3.3.0
James Moger [Wed, 5 Mar 2014 22:48:21 +0000 (17:48 -0500)]
Update to JGit 3.3.0

10 years agoMerge pull request #147 from Mrbytes/master
James Moger [Wed, 5 Mar 2014 22:35:43 +0000 (17:35 -0500)]
Merge pull request #147 from Mrbytes/master

Translation esES updated

10 years agoTranslation esES updated 147/head
mrbytes [Wed, 5 Mar 2014 22:06:10 +0000 (23:06 +0100)]
Translation esES updated
- Ready for the 1.4.0 release plus a few Fixes

Signed-off-by: mrbytes <eguervos@msn.com>
10 years agoAdd setting to hide the navbar for those embedding Gitblit
James Moger [Wed, 5 Mar 2014 18:19:40 +0000 (13:19 -0500)]
Add setting to hide the navbar for those embedding Gitblit

10 years agoCentralized ticket editing permission controls
James Moger [Wed, 5 Mar 2014 17:26:14 +0000 (12:26 -0500)]
Centralized ticket editing permission controls

10 years agoDelegate closed ticket changes to the Edit Ticket page
James Moger [Wed, 5 Mar 2014 16:41:34 +0000 (11:41 -0500)]
Delegate closed ticket changes to the Edit Ticket page

10 years agoAllow unregistered milestone selection on edit ticket page
James Moger [Wed, 5 Mar 2014 16:26:26 +0000 (11:26 -0500)]
Allow unregistered milestone selection on edit ticket page

10 years agoAllow changing status from edit ticket page
James Moger [Wed, 5 Mar 2014 16:19:50 +0000 (11:19 -0500)]
Allow changing status from edit ticket page

10 years agoNew proposal notifications should include the patchset details
James Moger [Wed, 5 Mar 2014 16:07:49 +0000 (11:07 -0500)]
New proposal notifications should include the patchset details

10 years agoAllow integration (mergeTo) branch to be changed in edit ticket
James Moger [Wed, 5 Mar 2014 15:56:34 +0000 (10:56 -0500)]
Allow integration (mergeTo) branch to be changed in edit ticket

10 years agoLocalize the ticket activity tab field name changes
James Moger [Wed, 5 Mar 2014 15:53:01 +0000 (10:53 -0500)]
Localize the ticket activity tab field name changes

10 years agoMerge pull request #145 from yin8086/ChineseTrans
James Moger [Wed, 5 Mar 2014 16:31:22 +0000 (11:31 -0500)]
Merge pull request #145 from yin8086/ChineseTrans

Fix Chinese translate strings

10 years agoMerge pull request #144 from ds5apn/master
James Moger [Wed, 5 Mar 2014 16:31:08 +0000 (11:31 -0500)]
Merge pull request #144 from ds5apn/master

Update Korean Translation for Gitblit 1.4.0

10 years agoFix Chinese translate strings 145/head
Stardrad Yin [Wed, 5 Mar 2014 15:16:53 +0000 (23:16 +0800)]
Fix Chinese translate strings

10 years agoRestart the response on the empty page if the repository has no commits
James Moger [Wed, 5 Mar 2014 13:58:50 +0000 (08:58 -0500)]
Restart the response on the empty page if the repository has no commits

10 years agoUpdate Korean Translation for Gitblit 1.4.0 144/head
Dongsu, KIM [Wed, 5 Mar 2014 13:47:40 +0000 (22:47 +0900)]
Update Korean Translation for Gitblit 1.4.0

10 years agoRemove Dagger injector from the servlet context instead of nulling it
James Moger [Wed, 5 Mar 2014 13:20:36 +0000 (08:20 -0500)]
Remove Dagger injector from the servlet context instead of nulling it

10 years agoExternalize some additional strings
James Moger [Wed, 5 Mar 2014 13:07:36 +0000 (08:07 -0500)]
Externalize some additional strings

10 years agoPrevent <nil> from being stored as a milestone
James Moger [Wed, 5 Mar 2014 13:04:59 +0000 (08:04 -0500)]
Prevent <nil> from being stored as a milestone

10 years agoImplement user "disabled" flag as an alternative to deleting the account 21/21/1
James Moger [Tue, 4 Mar 2014 22:29:02 +0000 (17:29 -0500)]
Implement user "disabled" flag as an alternative to deleting the account

10 years agoSimplified propose instructions for an existing ticket
James Moger [Tue, 4 Mar 2014 20:24:22 +0000 (15:24 -0500)]
Simplified propose instructions for an existing ticket

10 years agoProcess bugtraq configuration in markup document rendering
James Moger [Tue, 4 Mar 2014 18:37:12 +0000 (13:37 -0500)]
Process bugtraq configuration in markup document rendering

10 years agoDocumentation
James Moger [Tue, 4 Mar 2014 18:17:42 +0000 (13:17 -0500)]
Documentation

10 years agoUpdate site structure
James Moger [Tue, 4 Mar 2014 15:05:11 +0000 (10:05 -0500)]
Update site structure

10 years agoUpdate contributors list
James Moger [Tue, 4 Mar 2014 14:56:23 +0000 (09:56 -0500)]
Update contributors list

10 years agoMerge pull request #143 from yin8086/ChineseTrans
James Moger [Tue, 4 Mar 2014 14:17:38 +0000 (09:17 -0500)]
Merge pull request #143 from yin8086/ChineseTrans

Add Chinese translation for 1.4.0

10 years agoAdd Chinese translation for 1.4.0 143/head
Stardrad Yin [Tue, 4 Mar 2014 13:16:27 +0000 (21:16 +0800)]
Add Chinese translation for 1.4.0

10 years agoDocumentation
James Moger [Tue, 4 Mar 2014 04:03:47 +0000 (23:03 -0500)]
Documentation

10 years agoLower opacity for merge commit short messages in the log panel
James Moger [Tue, 4 Mar 2014 03:48:43 +0000 (22:48 -0500)]
Lower opacity for merge commit short messages in the log panel

10 years agoFix reflog parsing bug of null compare links on branch creation
James Moger [Tue, 4 Mar 2014 03:23:13 +0000 (22:23 -0500)]
Fix reflog parsing bug of null compare links on branch creation

10 years agoFix pt push regression due to eliminating --patchset argument
James Moger [Tue, 4 Mar 2014 03:04:45 +0000 (22:04 -0500)]
Fix pt push regression due to eliminating --patchset argument

10 years agoMerged #1 "Ticket tracker with patchset contributions"
James Moger [Tue, 4 Mar 2014 02:37:54 +0000 (20:37 -0600)]
Merged #1 "Ticket tracker with patchset contributions"

10 years agoTicket tracker with patchset contributions 01/1/18
James Moger [Mon, 9 Dec 2013 22:19:03 +0000 (17:19 -0500)]
Ticket tracker with patchset contributions

A basic issue tracker styled as a hybrid of GitHub and BitBucket issues.
You may attach commits to an existing ticket or you can push a single
commit to create a *proposal* ticket.

Tickets keep track of patchsets (one or more commits) and allow patchset
rewriting (rebase, amend, squash) by detecing the non-fast-forward
update and assigning a new patchset number to the new commits.

Ticket tracker
--------------

The ticket tracker stores tickets as an append-only journal of changes.
The journals are deserialized and a ticket is built by applying the
journal entries.  Tickets are indexed using Apache Lucene and all
queries and searches are executed against this Lucene index.

There is one trade-off to this persistence design: user attributions are
non-relational.

What does that mean?  Each journal entry stores the username of the
author.  If the username changes in the user service, the journal entry
will not reflect that change because the values are hard-coded.

Here are a few reasons/justifications for this design choice:

1. commit identifications (author, committer, tagger) are non-relational
2. maintains the KISS principle
3. your favorite text editor can still be your administration tool

Persistence Choices
-------------------

**FileTicketService**: stores journals on the filesystem
**BranchTicketService**: stores journals on an orphan branch
**RedisTicketService**: stores journals in a Redis key-value datastore

It should be relatively straight-forward to develop other backends
(MongoDB, etc) as long as the journal design is preserved.

Pushing Commits
---------------

Each push to a ticket is identified as a patchset revision.  A patchset
revision may add commits to the patchset (fast-forward) OR a patchset
revision may rewrite history (rebase, squash, rebase+squash, or amend).
Patchset authors should not be afraid to polish, revise, and rewrite
their code before merging into the proposed branch.

Gitblit will create one ref for each patchset.  These refs are updated
for fast-forward pushes or created for rewrites.  They are formatted as
`refs/tickets/{shard}/{id}/{patchset}`.  The *shard*  is the last two
digits of the id.  If the id < 10, prefix a 0.  The *shard* is always
two digits long.  The shard's purpose is to ensure Gitblit doesn't
exceed any filesystem directory limits for file creation.

**Creating a Proposal Ticket**

You may create a new change proposal ticket just by pushing a **single
commit** to `refs/for/{branch}` where branch is the proposed integration
branch OR `refs/for/new` or `refs/for/default` which both will use the
default repository branch.

    git push origin HEAD:refs/for/new

**Updating a Patchset**

The safe way to update an existing patchset is to push to the patchset
ref.

    git push origin HEAD:refs/heads/ticket/{id}

This ensures you do not accidentally create a new patchset in the event
that the patchset was updated after you last pulled.

The not-so-safe way to update an existing patchset is to push using the
magic ref.

    git push origin HEAD:refs/for/{id}

This push ref will update an exisitng patchset OR create a new patchset
if the update is non-fast-forward.

**Rebasing, Squashing, Amending**

Gitblit makes rebasing, squashing, and amending patchsets easy.

Normally, pushing a non-fast-forward update would require rewind (RW+)
repository permissions.  Gitblit provides a magic ref which will allow
ticket participants to rewrite a ticket patchset as long as the ticket
is open.

    git push origin HEAD:refs/for/{id}

Pushing changes to this ref allows the patchset authors to rebase,
squash, or amend the patchset commits without requiring client-side use
of the *--force* flag on push AND without requiring RW+ permission to
the repository.  Since each patchset is tracked with a ref it is easy to
recover from accidental non-fast-forward updates.

Features
--------

- Ticket tracker with status changes and responsible assignments
- Patchset revision scoring mechanism
- Update/Rewrite patchset handling
- Close-on-push detection
- Server-side Merge button for simple merges
- Comments with Markdown syntax support
- Rich mail notifications
- Voting
- Mentions
- Watch lists
- Querying
- Searches
- Partial miletones support
- Multiple backend options

10 years agoEliminate Gravatar profile linking and improve api
James Moger [Mon, 3 Mar 2014 22:41:54 +0000 (17:41 -0500)]
Eliminate Gravatar profile linking and improve api

10 years agoReduce use of final to avoid Wicket serialization issues in reflogs
James Moger [Mon, 3 Mar 2014 22:28:19 +0000 (17:28 -0500)]
Reduce use of final to avoid Wicket serialization issues in reflogs

10 years agoFixed rounded timestamps of reflogs
James Moger [Mon, 3 Mar 2014 22:23:15 +0000 (17:23 -0500)]
Fixed rounded timestamps of reflogs

10 years agoEliminate problematic HEAD links from the blob, blame, and tree pages
James Moger [Mon, 3 Mar 2014 22:02:52 +0000 (17:02 -0500)]
Eliminate problematic HEAD links from the blob, blame, and tree pages

10 years agoFix layouts on edit pages to properly use Bootstrap rows and spans
James Moger [Mon, 3 Mar 2014 21:52:10 +0000 (16:52 -0500)]
Fix layouts on edit pages to properly use Bootstrap rows and spans

10 years agoCSS tweak
James Moger [Mon, 3 Mar 2014 17:14:06 +0000 (12:14 -0500)]
CSS tweak

10 years agoFix compare page exception when a submodule changes (issue-375)
James Moger [Mon, 3 Mar 2014 16:33:24 +0000 (11:33 -0500)]
Fix compare page exception when a submodule changes (issue-375)

10 years agoAdd an ajax text link and an icon ajax link
James Moger [Fri, 28 Feb 2014 23:27:40 +0000 (18:27 -0500)]
Add an ajax text link and an icon ajax link

10 years agoAdd the No Docs page if there are no root documents
James Moger [Fri, 28 Feb 2014 23:14:54 +0000 (18:14 -0500)]
Add the No Docs page if there are no root documents

10 years agoFix potential NPE in creating a date label
James Moger [Fri, 28 Feb 2014 23:00:18 +0000 (18:00 -0500)]
Fix potential NPE in creating a date label

10 years agoBypass Wicket bug related to url coding of array-type parameters
James Moger [Fri, 28 Feb 2014 22:58:24 +0000 (17:58 -0500)]
Bypass Wicket bug related to url coding of array-type parameters