Bläddra i källkod

Merge branch 'ticket/54' into develop

tags/v1.6.0
James Moger 10 år sedan
förälder
incheckning
ae6db86596

+ 1
- 0
releases.moxie Visa fil

- Fix forcing default locale to en or LANG_CC for web ui (ticket-51) - Fix forcing default locale to en or LANG_CC for web ui (ticket-51)
- Fix inconsistency with repository ownership permission checking (ticket-52) - Fix inconsistency with repository ownership permission checking (ticket-52)
- Prevent submission from New|Edit ticket page with empty titles (ticket-53) - Prevent submission from New|Edit ticket page with empty titles (ticket-53)
- Ensure the repository model ref list is refreshed on ref creation or deletion (ticket-54)
- Fix case-sensitivity error in determining fork network (issue-420, ticket-62) - Fix case-sensitivity error in determining fork network (issue-420, ticket-62)
- Fix transport determination for SSH urls served on port 22 (issue-421, ticket-63) - Fix transport determination for SSH urls served on port 22 (issue-421, ticket-63)
changes: changes:

+ 8
- 0
src/main/java/com/gitblit/git/GitblitReceivePack.java Visa fil

return; return;
} }
boolean isRefCreationOrDeletion = false;
// log ref changes // log ref changes
for (ReceiveCommand cmd : commands) { for (ReceiveCommand cmd : commands) {
switch (cmd.getType()) { switch (cmd.getType()) {
case DELETE: case DELETE:
LOGGER.info(MessageFormat.format("{0} DELETED {1} in {2} ({3})", user.username, cmd.getRefName(), repository.name, cmd.getOldId().name())); LOGGER.info(MessageFormat.format("{0} DELETED {1} in {2} ({3})", user.username, cmd.getRefName(), repository.name, cmd.getOldId().name()));
isRefCreationOrDeletion = true;
break; break;
case CREATE: case CREATE:
LOGGER.info(MessageFormat.format("{0} CREATED {1} in {2}", user.username, cmd.getRefName(), repository.name)); LOGGER.info(MessageFormat.format("{0} CREATED {1} in {2}", user.username, cmd.getRefName(), repository.name));
isRefCreationOrDeletion = true;
break; break;
case UPDATE: case UPDATE:
LOGGER.info(MessageFormat.format("{0} UPDATED {1} in {2} (from {3} to {4})", user.username, cmd.getRefName(), repository.name, cmd.getOldId().name(), cmd.getNewId().name())); LOGGER.info(MessageFormat.format("{0} UPDATED {1} in {2} (from {3} to {4})", user.username, cmd.getRefName(), repository.name, cmd.getOldId().name(), cmd.getNewId().name()));
} }
} }
if (isRefCreationOrDeletion) {
gitblit.resetRepositoryCache(repository.name);
}
if (repository.useIncrementalPushTags) { if (repository.useIncrementalPushTags) {
// tag each pushed branch tip // tag each pushed branch tip
String emailAddress = user.emailAddress == null ? rp.getRefLogIdent().getEmailAddress() : user.emailAddress; String emailAddress = user.emailAddress == null ? rp.getRefLogIdent().getEmailAddress() : user.emailAddress;

+ 5
- 0
src/main/java/com/gitblit/manager/GitblitManager.java Visa fil

repositoryManager.resetRepositoryListCache(); repositoryManager.resetRepositoryListCache();
} }


@Override
public void resetRepositoryCache(String repositoryName) {
repositoryManager.resetRepositoryCache(repositoryName);
}

@Override @Override
public List<String> getRepositoryList() { public List<String> getRepositoryList() {
return repositoryManager.getRepositoryList(); return repositoryManager.getRepositoryList();

+ 8
- 0
src/main/java/com/gitblit/manager/IRepositoryManager.java Visa fil

*/ */
void resetRepositoryListCache(); void resetRepositoryListCache();


/**
* Reset all caches for this repository.
*
* @param repositoryName
* @since 1.5.1
*/
void resetRepositoryCache(String repositoryName);

/** /**
* Returns the list of all repositories available to Gitblit. This method * Returns the list of all repositories available to Gitblit. This method
* does not consider user access permissions. * does not consider user access permissions.

+ 12
- 0
src/main/java/com/gitblit/manager/RepositoryManager.java Visa fil

CommitCache.instance().clear(repositoryName); CommitCache.instance().clear(repositoryName);
} }


/**
* Reset all caches for this repository.
*
* @param repositoryName
* @since 1.5.1
*/
@Override
public void resetRepositoryCache(String repositoryName) {
removeFromCachedRepositoryList(repositoryName);
clearRepositoryMetadataCache(repositoryName);
}

/** /**
* Resets the repository list cache. * Resets the repository list cache.
* *

Laddar…
Avbryt
Spara