Skip to content

Commit 7031f90

Browse files
flaixflaix
committed
Adjust path after moving from "gitblit" to "gitblit-org" on Github
1 parent 4baed92 commit 7031f90

19 files changed

+36
-37
lines changed

‎.gitbugtraq

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[bugtraq "issues"]
2-
url = https://github.com/gitblit/gitblit/issues/%BUGID%
2+
url = https://github.com/gitblit-org/gitblit/issues/%BUGID%
33
loglinkregex = "[Ii]ssue[-#:\\s]{1}\\d+"
44
logregex = "\\d+"
55
loglinktext = issue-%BUGID%
66
[bugtraq "pullrequests"]
7-
url = "https://github.com/gitblit/gitblit/pull/%BUGID%"
7+
url = "https://github.com/gitblit-org/gitblit/pull/%BUGID%"
88
loglinkregex = "(?:pull request|pull|pr)\\s*[-#]?[0-9]+"
99
logregex = "\\d+"
1010
loglinktext = "pull request #%BUGID%"

‎.github/workflows/nightly-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
if: needs.secret-gate.outputs.build_docker == 'true' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
128128
needs: secret-gate
129129
env:
130-
GH_ORG: gitblit
130+
GH_ORG: gitblit-org
131131
GITBLIT_VERSION: SNAPSHOT
132132

133133
steps:
@@ -215,7 +215,7 @@ jobs:
215215
216216
# Delete the artifact unless this is the official Gitblit repo
217217
- uses: geekyeggo/delete-artifact@v2
218-
if: ${{ github.repository != 'gitblit/gitblit' }}
218+
if: ${{ github.repository != 'gitblit-org/gitblit' }}
219219
with:
220220
name: gitblit-nightly
221221
failOnError: false

‎README.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Gitblit is an open source, pure Java Git solution for managing, viewing, and ser
55

66
More information about Gitblit can be found [here](http://gitblit.com).
77

8-
<a href='https://github.com/gitblit/gitblit/releases/latest' title='Download'><img alt='download badge' src='https://img.shields.io/badge/dynamic/json?color=9cf&label=Download&query=%24.name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fgitblit%2Fgitblit%2Freleases%2Flatest'></a>
8+
<a href='https://github.com/gitblit-org/gitblit/releases/latest' title='Download'><img alt='download badge' src='https://img.shields.io/badge/dynamic/json?color=9cf&label=Download&query=%24.name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fgitblit-org%2Fgitblit%2Freleases%2Flatest'></a>
99
<a title='nightly docker' href='https://hub.docker.com/r/gitblit/gitblit/tags?page=1&name=nightly'><img alt='nightly docker badge' src='https://img.shields.io/badge/dynamic/json?color=2496ed&label=Nightly Docker&query=%24.tag_last_pushed&cacheSeconds=43200&url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fgitblit%2Fgitblit%2Ftags%2Fnightly'></a>
10-
![License](https://img.shields.io/github/license/gitblit/gitblit?color=%23f29024)
10+
![License](https://img.shields.io/github/license/gitblit-org/gitblit?color=%23f29024)
1111

1212
License
1313
-------
@@ -18,7 +18,7 @@ The text of the license is included in the file LICENSE in the root of the proje
1818
Java Runtime Requirement
1919
------------------------------------
2020

21-
Gitblit requires at Java 8 Runtime Environment (JRE) or a Java 8 Development Kit (JDK).
21+
Gitblit requires a Java 8 Runtime Environment (JRE) or a Java 8 Development Kit (JDK).
2222

2323
Getting help
2424
------------

‎build.moxie

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ releaseDate: 2022-02-05
1919

2020
# Project urls
2121
url: 'http://gitblit.com'
22-
issuesUrl: 'https://github.com/gitblit/gitblit'
22+
issuesUrl: 'https://github.com/gitblit-org/gitblit'
2323
socialNetworkUrl: 'https://plus.google.com/114464678392593421684'
2424
forumUrl: 'http://groups.google.com/group/gitblit'
25-
mavenUrl: 'http://gitblit.github.io/gitblit-maven'
25+
mavenUrl: 'http://gitblit-org.github.io/gitblit-maven'
2626

2727
# Licenses section included for POM generation
2828
licenses:
@@ -44,9 +44,9 @@ developers:
4444

4545
# SCM section included for POM generation
4646
scm: {
47-
connection: 'scm:git:git://github.com/gitblit/gitblit.git'
48-
developerConnection: 'scm:git:https://github.com/gitblit/gitblit.git'
49-
url: 'https://github.com/gitblit/gitblit'
47+
connection: 'scm:git:git://github.com/gitblit-org/gitblit.git'
48+
developerConnection: 'scm:git:https://github.com/gitblit-org/gitblit.git'
49+
url: 'https://github.com/gitblit-org/gitblit'
5050
tag: HEAD
5151
}
5252

@@ -98,7 +98,7 @@ registeredRepositories:
9898
- { id: mavencentral, url: 'https://repo1.maven.org/maven2' }
9999
- { id: eclipse, url: 'https://repo.eclipse.org/content/groups/releases' }
100100
- { id: eclipse-snapshots, url: 'https://repo.eclipse.org/content/groups/snapshots' }
101-
- { id: gitblit, url: 'http://gitblit.github.io/gitblit-maven' }
101+
- { id: gitblit, url: 'http://gitblit-org.github.io/gitblit-maven' }
102102

103103
# Source all dependencies from the following repositories in the specified order
104104
repositories: central, eclipse-snapshots, eclipse, gitblit

‎build.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<property name="relnoawk" location="${basedir}/src/site/templates/ghreleasenotes.awk" />
3636

3737
<!-- GitHub user/organization name -->
38-
<property name="gh.org" value="gitblit" />
38+
<property name="gh.org" value="gitblit-org" />
3939
<!-- GitHub project name -->
4040
<property name="gh.repo" value="gitblit" />
4141

@@ -646,9 +646,9 @@
646646

647647
<properties token="%PROPERTIES%" file="${project.distrib.dir}/data/defaults.properties" />
648648

649-
<regex searchPattern="\b(commit)(\s*[#]?|-){0,1}([0-9a-fA-F]{5,})\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/commit/$3'&gt;commit $3&lt;/a&gt;" />
650-
<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/issues/$3'&gt;issue $3&lt;/a&gt;" />
651-
<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />
649+
<regex searchPattern="\b(commit)(\s*[#]?|-){0,1}([0-9a-fA-F]{5,})\b" replacePattern="&lt;a href='https://github.com/gitblit-org/gitblit/commit/$3'&gt;commit $3&lt;/a&gt;" />
650+
<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit-org/gitblit/issues/$3'&gt;issue $3&lt;/a&gt;" />
651+
<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit-org/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />
652652
<regex searchPattern="\b(ticket)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://dev.gitblit.com/tickets/gitblit.git/$3'&gt;ticket $3&lt;/a&gt;" />
653653

654654
<!-- Set the logo from the mx:doc resources -->
@@ -1114,9 +1114,9 @@ GBLT_RELEASE_TAG=${project.tag}
11141114

11151115
<properties token="%PROPERTIES%" file="${project.distrib.dir}/data/defaults.properties" />
11161116

1117-
<regex searchPattern="\b(commit)(\s*[#]?|-){0,1}([0-9a-fA-F]{5,})\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/commit/$3'&gt;commit $3&lt;/a&gt;" />
1118-
<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/issues/$3'&gt;issue $3&lt;/a&gt;" />
1119-
<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />
1117+
<regex searchPattern="\b(commit)(\s*[#]?|-){0,1}([0-9a-fA-F]{5,})\b" replacePattern="&lt;a href='https://github.com/gitblit-org/gitblit/commit/$3'&gt;commit $3&lt;/a&gt;" />
1118+
<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit-org/gitblit/issues/$3'&gt;issue $3&lt;/a&gt;" />
1119+
<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://github.com/gitblit-org/gitblit/pull/$3'&gt;pull request #$3&lt;/a&gt;" />
11201120
<regex searchPattern="\b(ticket)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='https://dev.gitblit.com/tickets/gitblit.git/$3'&gt;ticket $3&lt;/a&gt;" />
11211121

11221122
<!-- Set the logo from the mx:doc resources -->

‎src/main/distrib/data/defaults.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ git.searchExclusions =
6969
# List of regex url patterns for extracting a repository name when locating
7070
# submodules.
7171
# e.g. git.submoduleUrlPatterns = .*?://github.com/(.*) will extract
72-
# *gitblit/gitblit.git* from *git://github.com/gitblit/gitblit.git*
72+
# *gitblit-org/gitblit.git* from *git://github.com/gitblit-org/gitblit.git*
7373
# If no matches are found then the submodule repository name is assumed to be
7474
# whatever trails the last / character. (e.g. gitblit.git).
7575
#

‎src/main/distrib/data/groovy/youtrack-readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ Due to limited authentication options when using the YouTrack REST API, you have
2727

2828
## Attribution
2929

30-
Much of this script was cobbled together from the example receive hooks in the official [GitBlit](https://github.com/gitblit/gitblit) distribution.
30+
Much of this script was cobbled together from the example receive hooks in the official [GitBlit](https://github.com/gitblit-org/gitblit) distribution.

‎src/site/design.mkd

+1-2
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,5 @@ Contributions must be your own original work and must licensed under the [Apache
8787

8888
[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
8989
[git]: http://git-scm.com "Official Git Site"
90-
[gitbltsrc]: http://github.com/gitblit "gitblit git repository"
91-
[googlecode]: http://code.google.com/p/gitblit "gitblit project management"
90+
[gitbltsrc]: http://github.com/gitblit-org/gitblit "gitblit git repository"
9291
[apachelicense]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0"

‎src/site/federation.mkd

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ The repositories will be put in *git.repositoriesFolder*/example4.
313313

314314
## Federation Client
315315

316-
Instead of setting up a full-blown pulling Gitblit instance, you can also use the [federation client](https://github.com/gitblit/gitblit/releases/latest) command-line utility. This is a packaged subset of the federation feature in a smaller, simpler command-line only tool.
316+
Instead of setting up a full-blown pulling Gitblit instance, you can also use the [federation client](https://github.com/gitblit-org/gitblit/releases/latest) command-line utility. This is a packaged subset of the federation feature in a smaller, simpler command-line only tool.
317317

318318
The *federation client* relies on many of the same dependencies as Gitblit and will download them on first execution.
319319

‎src/site/plugins_extensions.mkd

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gitblit offers several extension points for enhancing and customizing it's runtime behavior.
44

5-
Each available extension point has a sample implementation in the [gitblit-cookbook-plugin (Maven project)](https://github.com/gitblit/gitblit-cookbook-plugin).
5+
Each available extension point has a sample implementation in the [gitblit-cookbook-plugin (Maven project)](https://github.com/gitblit-org/gitblit-cookbook-plugin).
66

77
**NOTE:**
88
Gitblit does not yet offer a comprehensize dependency injection architecture. This will be addressed in a subsequent release. For now you may access all of Gitblit's core managers through a static singleton app context:

‎src/site/plugins_overview.mkd

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Gitblit provides a simple default registry of plugins. The registry is a JSON fi
5353

5454
plugins.registry = http://plugins.gitblit.com/plugins.json
5555

56-
The [default plugins registry](http://plugins.gitblit.com) is currently hosted in a [Git repository on Github](https://github.com/gitblit/gitblit-registry). You can view the default registry file [here](http://plugins.gitblit.com/plugins.json). The default plugin registry is also a Maven-2 compatible repository.
56+
The [default plugins registry](http://plugins.gitblit.com) is currently hosted in a [Git repository on Github](https://github.com/gitblit-org/gitblit-registry). You can view the default registry file [here](http://plugins.gitblit.com/plugins.json). The default plugin registry is also a Maven-2 compatible repository.
5757

5858
### Contributing Plugins to the Default Registry
5959

‎src/site/releasehistory.mkd

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ If you are updating from an earlier release AND you have indexed branches with t
139139
- Preliminary bare repository submodule support<br/>
140140
**New:** *git.submoduleUrlPatterns=*
141141
- *git.submoduleUrlPatterns* is a space-delimited list of regular expressions for extracting a repository name from a submodule url.<br/>
142-
For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit/gitblit.git* from *git://github.git/gitblit/gitblit.git*<br/>
142+
For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit-org/gitblit.git* from *git://github.git/gitblit-org/gitblit.git*<br/>
143143
**Note:** You may not need this control to work with submodules, but it is there if you do.
144144
- If there are no matches from *git.submoduleUrlPatterns* then the repository name is assumed to be whatever comes after the last `/` character *(e.g. gitblit.git)*
145145
- Gitblit will try to locate this repository relative to the current repository *(e.g. myfolder/myrepo.git, myfolder/mysubmodule.git)* and then at the root level *(mysubmodule.git)* if that fails.

‎src/site/releases.mkd

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ If you are updating from an earlier release AND you have indexed branches with t
201201
- Preliminary bare repository submodule support<br/>
202202
**New:** *git.submoduleUrlPatterns=*
203203
- *git.submoduleUrlPatterns* is a space-delimited list of regular expressions for extracting a repository name from a submodule url.<br/>
204-
For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit/gitblit.git* from *git://github.git/gitblit/gitblit.git*<br/>
204+
For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit-org/gitblit.git* from *git://github.git/gitblit-org/gitblit.git*<br/>
205205
**Note:** You may not need this control to work with submodules, but it is there if you do.
206206
- If there are no matches from *git.submoduleUrlPatterns* then the repository name is assumed to be whatever comes after the last `/` character *(e.g. gitblit.git)*
207207
- Gitblit will try to locate this repository relative to the current repository *(e.g. myfolder/myrepo.git, myfolder/mysubmodule.git)* and then at the root level *(mysubmodule.git)* if that fails.

‎src/site/rpc.mkd

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The Gitblit JSON RPC mechanism, like the Gitblit JGit servlet, syndication/feed
1616

1717
The Gitblit Manager is an example Java/Swing application that allows remote management (repository and user objects) and administration (server settings) of a Gitblit server.
1818

19-
This application uses a combination of RSS feeds and the JSON RPC interface, both of which are part of the [Gitblit API](https://github.com/gitblit/gitblit/releases/latest) library, to present live information from a Gitblit server. Some JSON RPC methods from the utility class `com.gitblit.utils.RpcUtils` are not currently used by the Gitblit Manager.
19+
This application uses a combination of RSS feeds and the JSON RPC interface, both of which are part of the [Gitblit API](https://github.com/gitblit-org/gitblit/releases/latest) library, to present live information from a Gitblit server. Some JSON RPC methods from the utility class `com.gitblit.utils.RpcUtils` are not currently used by the Gitblit Manager.
2020

2121
**NOTE:**
2222
Gitblit Manager stores your login credentials **INSECURELY** in homedir/.gitblit/config.

‎src/site/setup_authentication.mkd

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To use the *LdapUserService* set *realm.authenticationProviders=ldap* in your `g
2525
#### Example LDAP Layout
2626
![block diagram](ldapSample.png "LDAP Sample")
2727

28-
Please see [ldapUserServiceSampleData.ldif](https://github.com/gitblit/gitblit/blob/master/src/test/resources/ldap/sampledata.ldif) to see the data in LDAP that reflects the above picture.
28+
Please see [ldapUserServiceSampleData.ldif](https://github.com/gitblit-org/gitblit/blob/master/src/test/resources/ldap/sampledata.ldif) to see the data in LDAP that reflects the above picture.
2929

3030
#### Gitblit Settings for Example LDAP Layout
3131
The following are the settings required to configure Gitblit to authenticate against the example LDAP server with LDAP-controlled team memberships.
@@ -137,7 +137,7 @@ If you are using the WAR variant and deploying into your own servlet container w
137137

138138
This is the simplest choice where you implement custom authentication and delegate all other standard user and team operations to one of Gitblit's user service implementations. This choice insulates your customization from changes in User and Team model classes and additional API that may be added to IUserService.
139139

140-
Please subclass [com.gitblit.auth.AuthenticationProvider.UsernamePasswordAuthenticationProvider](https://github.com/gitblit/gitblit/blob/master/src/main/java/com/gitblit/auth/AuthenticationProvider.java).
140+
Please subclass [com.gitblit.auth.AuthenticationProvider.UsernamePasswordAuthenticationProvider](https://github.com/gitblit-org/gitblit/blob/master/src/main/java/com/gitblit/auth/AuthenticationProvider.java).
141141

142142
You may use your subclass by specifying its fully qualified classname in the *realm.authenticationProviders* setting.
143143

@@ -150,5 +150,5 @@ Instead of maintaining a `users.conf` file, you may want to integrate Gitblit in
150150
You may use your own custom *com.gitblit.IUserService* implementation by specifying its fully qualified classname in the *realm.userService* setting.
151151

152152
Your user service class must be on Gitblit's classpath and must have a public default constructor.
153-
Please see the following interface definition [com.gitblit.IUserService](https://github.com/gitblit/gitblit/blob/master/src/main/java/com/gitblit/IUserService.java).
153+
Please see the following interface definition [com.gitblit.IUserService](https://github.com/gitblit-org/gitblit/blob/master/src/main/java/com/gitblit/IUserService.java).
154154

‎src/site/setup_bugtraq.mkd

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This file is formatted like a standard Git config file. Here are some quick exa
2828
logregex = (JRA-\\d+)
2929

3030
[bugtraq "github"]
31-
url = "https://github.com/gitblit/gitblit/pull/%BUGID%"
31+
url = "https://github.com/gitblit-org/gitblit/pull/%BUGID%"
3232
loglinkregex = "(?:pull request|pull|pr)\\s*[-#]?[0-9]+"
3333
logregex = "\\d+"
3434
loglinktext = "pull request #%BUGID%"

‎src/site/setup_go.mkd

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,5 @@ You can override Gitblit GO's default Log4j configuration with a command-line pa
151151

152152
java -Dlog4j.configuration=file:///home/james/log4j.properties -cp gitblit.jar:"ext/*" com.gitblit.GitBlitServer <optional_gitblit_args>
153153

154-
You can not use override the default log4j configuration *AND* specify the `--dailyLogFile` parameter. For reference, here is [Gitblit's default Log4j configuration](https://github.com/gitblit/gitblit/blob/master/src/log4j.properties). It includes some file appenders that are disabled by default.
154+
You can not use override the default log4j configuration *AND* specify the `--dailyLogFile` parameter. For reference, here is [Gitblit's default Log4j configuration](https://github.com/gitblit-org/gitblit/blob/master/src/log4j.properties). It includes some file appenders that are disabled by default.
155155

‎src/site/siteindex.mkd

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Gitblit blends elements of GitHub, BitBucket, and Gerrit to provide a streamline
6868

6969
Administrators can create and manage all repositories, user accounts, and teams from the *Web UI*.
7070
Administrators can create and manage all repositories, user accounts, and teams from the *JSON RPC interface* using the [Gitblit Manager](%GCURL%manager-${project.releaseVersion}.zip) or your own custom tooling.
71-
Administrators can create and manage all repositories, user accounts, and teams from the *command-line* using SSH & the [Powertools plugin](https://github.com/gitblit/gitblit-powertools-plugin).
71+
Administrators can create and manage all repositories, user accounts, and teams from the *command-line* using SSH & the [Powertools plugin](https://github.com/gitblit-org/gitblit-powertools-plugin).
7272

7373
### Integration with Your Infrastructure
7474

‎src/test/config/test-ui-gitblit.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ git.searchExclusions =
5151
# List of regex url patterns for extracting a repository name when locating
5252
# submodules.
5353
# e.g. git.submoduleUrlPatterns = .*?://github.com/(.*) will extract
54-
# *gitblit/gitblit.git* from *git://github.com/gitblit/gitblit.git*
54+
# *gitblit-org/gitblit.git* from *git://github.com/gitblit-org/gitblit.git*
5555
# If no matches are found then the submodule repository name is assumed to be
5656
# whatever trails the last / character. (e.g. gitblit.git).
5757
#

0 commit comments

Comments
 (0)