Browse Source

Merged #102 "NPE in GitblitClient"

tags/v1.6.0
James Moger 10 years ago
parent
commit
0e63b9a5d5
2 changed files with 6 additions and 3 deletions
  1. 1
    0
      releases.moxie
  2. 5
    3
      src/main/java/com/gitblit/client/GitblitClient.java

+ 1
- 0
releases.moxie View File

- Fixed Ticket responsible selections not considering the AUTHENTICATED authorization control (ticket-91) - Fixed Ticket responsible selections not considering the AUTHENTICATED authorization control (ticket-91)
- Fixed invalid generated SSH url for port 22 (issue-444, ticket-98) - Fixed invalid generated SSH url for port 22 (issue-444, ticket-98)
- Fix cloning repositories with `+` in their names. (revert pr-136, issue-362, ticket-100) - Fix cloning repositories with `+` in their names. (revert pr-136, issue-362, ticket-100)
- Fixed NPE in GitblitClient (ticket-102)
changes: changes:
- Split the pages servlet into a raw servlet and a pages servlet. All raw links now use the raw servlet (issue-413, ticket-49) - Split the pages servlet into a raw servlet and a pages servlet. All raw links now use the raw servlet (issue-413, ticket-49)
- Drop deprecated --set-upstream syntax for -u (ticket-59) - Drop deprecated --set-upstream syntax for -u (ticket-59)

+ 5
- 3
src/main/java/com/gitblit/client/GitblitClient.java View File

// create list of available scripts by excluding inherited scripts // create list of available scripts by excluding inherited scripts
List<String> scripts = new ArrayList<String>(); List<String> scripts = new ArrayList<String>();
for (String script : settings.pushScripts) {
if (!inherited.contains(script)) {
scripts.add(script);
if (!ArrayUtils.isEmpty(settings.pushScripts)) {
for (String script : settings.pushScripts) {
if (!inherited.contains(script)) {
scripts.add(script);
}
} }
} }
return scripts; return scripts;

Loading…
Cancel
Save