diff options
| -rw-r--r-- | Bugzilla/DB/Sqlite.pm | 1 | ||||
| -rw-r--r-- | Bugzilla/Migrate.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Util.pm | 2 | ||||
| -rw-r--r-- | docs/en/rst/installing/linux.rst | 2 | ||||
| -rw-r--r-- | docs/en/rst/installing/mac-os-x.rst | 2 | ||||
| -rw-r--r-- | docs/en/rst/installing/migrating-from-2.inc.rst | 2 | ||||
| -rw-r--r-- | docs/en/rst/installing/quick-start.rst | 2 | ||||
| -rw-r--r-- | docs/en/rst/installing/upgrading-with-git.rst | 12 | ||||
| -rw-r--r-- | docs/en/rst/installing/windows.rst | 2 | ||||
| -rw-r--r-- | docs/en/rst/integrating/skins.rst | 2 | ||||
| -rwxr-xr-x | editflagtypes.cgi | 2 | ||||
| -rw-r--r-- | taskgraph.json | 36 |
12 files changed, 41 insertions, 26 deletions
diff --git a/Bugzilla/DB/Sqlite.pm b/Bugzilla/DB/Sqlite.pm index ddafc1696..a56ed31ad 100644 --- a/Bugzilla/DB/Sqlite.pm +++ b/Bugzilla/DB/Sqlite.pm @@ -219,6 +219,7 @@ sub sql_date_format { my ($self, $date, $format) = @_; $format = "%Y.%m.%d %H:%M:%S" if !$format; $format =~ s/\%i/\%M/g; + $format =~ s/\%s/\%S/g; return "STRFTIME(" . $self->quote($format) . ", $date)"; } diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm index 0731d4fed..7865c842d 100644 --- a/Bugzilla/Migrate.pm +++ b/Bugzilla/Migrate.pm @@ -403,7 +403,7 @@ sub parse_date { } my $tz; if ($time[6]) { - $tz = Bugzilla->local_timezone->offset_as_string($time[6]); + $tz = DateTime::TimeZone->offset_as_string($time[6]); } else { $tz = $self->config('timezone'); diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index bbf4261ca..5fe64621b 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -588,7 +588,7 @@ sub datetime_from { second => defined($time[0]) ? int($time[0]) : undef, # If a timezone was specified, use it. Otherwise, use the # local timezone. - time_zone => Bugzilla->local_timezone->offset_as_string($time[6]) + time_zone => DateTime::TimeZone->offset_as_string($time[6]) || Bugzilla->local_timezone, ); diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst index 22d0bf735..f40c5e8f0 100644 --- a/docs/en/rst/installing/linux.rst +++ b/docs/en/rst/installing/linux.rst @@ -117,7 +117,7 @@ Bugzilla The best way to get Bugzilla is to check it out from git: -:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla` +:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla` Run the above command in your home directory, replacing "X.X" with the 2-digit version number of the stable release of Bugzilla that you want - e.g. "4.4". diff --git a/docs/en/rst/installing/mac-os-x.rst b/docs/en/rst/installing/mac-os-x.rst index b18a5ec31..37a1d3610 100644 --- a/docs/en/rst/installing/mac-os-x.rst +++ b/docs/en/rst/installing/mac-os-x.rst @@ -28,7 +28,7 @@ Bugzilla The best way to get Bugzilla is to check it out from git: -:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla` +:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla` Run the above command in your home directory, replacing "X.X" with the 2-digit version number of the stable release of Bugzilla that you want - e.g. "4.4". diff --git a/docs/en/rst/installing/migrating-from-2.inc.rst b/docs/en/rst/installing/migrating-from-2.inc.rst index c9328077f..889e5c3d8 100644 --- a/docs/en/rst/installing/migrating-from-2.inc.rst +++ b/docs/en/rst/installing/migrating-from-2.inc.rst @@ -21,7 +21,7 @@ Mac OS X, you can Once git is installed, run these commands to pull a copy of Bugzilla: -:command:`git clone https://git.mozilla.org/bugzilla/bugzilla bugzilla-new` +:command:`git clone https://github.com/bugzilla/bugzilla bugzilla-new` :command:`cd bugzilla-new` diff --git a/docs/en/rst/installing/quick-start.rst b/docs/en/rst/installing/quick-start.rst index 64a88e55b..7ea5ed58a 100644 --- a/docs/en/rst/installing/quick-start.rst +++ b/docs/en/rst/installing/quick-start.rst @@ -64,7 +64,7 @@ Get it from our Git repository: :command:`cd /var/www/html` -:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla bugzilla` +:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla bugzilla` (where "X.X" is the 2-digit version number of the stable release of Bugzilla that you want - e.g. 5.0) diff --git a/docs/en/rst/installing/upgrading-with-git.rst b/docs/en/rst/installing/upgrading-with-git.rst index 075ff8902..855951349 100644 --- a/docs/en/rst/installing/upgrading-with-git.rst +++ b/docs/en/rst/installing/upgrading-with-git.rst @@ -9,6 +9,18 @@ intermediate steps. There is a script named :file:`checksetup.pl` included with Bugzilla that will automatically do all of the database migration for you. +Bugzilla is now hosted on Github, but we used to be hosted on git.mozilla.org. +If you got the code from git.mozilla.org, you need to point your +checkout at Github instead. To find out, run: + +:command:`git remote -v` + +If you see "git.mozilla.org" anywhere in the output, then run: + +:command:`git remote set-url origin https://github.com/bugzilla/bugzilla` + +This change will only ever need to be done once. + .. include:: upgrading-with-1.inc.rst You can see if you have local code customizations using: diff --git a/docs/en/rst/installing/windows.rst b/docs/en/rst/installing/windows.rst index adc1728c6..e2137a9fc 100644 --- a/docs/en/rst/installing/windows.rst +++ b/docs/en/rst/installing/windows.rst @@ -40,7 +40,7 @@ Bugzilla The best way to get Bugzilla is to check it out from git. Download and install git from the `git website <http://git-scm.com/download>`_, and then run: -:command:`git clone --branch release-X.X-stable https://git.mozilla.org/bugzilla/bugzilla C:\\bugzilla` +:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla C:\\bugzilla` where "X.X" is the 2-digit version number of the stable release of Bugzilla that you want (e.g. 5.0). diff --git a/docs/en/rst/integrating/skins.rst b/docs/en/rst/integrating/skins.rst index 2cd08b4c0..4c1d8e254 100644 --- a/docs/en/rst/integrating/skins.rst +++ b/docs/en/rst/integrating/skins.rst @@ -8,7 +8,7 @@ its underlying structure. It ships with two - "Classic" and "Dusk". You can find some more listed `on the wiki <https://wiki.mozilla.org/Bugzilla:Addons#Skins>`_, and there are a couple more which are part of -`bugzilla.mozilla.org <http://git.mozilla.org/?p=webtools/bmo/bugzilla.git>`_. +`bugzilla.mozilla.org <https://github.com/mozilla-bteam/bmo>`_. However, in each case you may need to check that the skin supports the version of Bugzilla you have. diff --git a/editflagtypes.cgi b/editflagtypes.cgi index d0b9443b5..71f7cb655 100755 --- a/editflagtypes.cgi +++ b/editflagtypes.cgi @@ -453,7 +453,7 @@ sub get_products_and_components { # Let's sort the list by classifications. @products = (); - push(@products, @{$class{$_->id}}) foreach Bugzilla::Classification->get_all; + push(@products, @{$class{$_->id} || []}) foreach Bugzilla::Classification->get_all; } } diff --git a/taskgraph.json b/taskgraph.json index 7433db6f2..ba1d1f3e0 100644 --- a/taskgraph.json +++ b/taskgraph.json @@ -17,8 +17,8 @@ "provisionerId": "aws-provisioner-v1", "workerType": "b2gtest", "payload": { - "image": "dklawren/docker-bugzilla", - "command": ["/runtests.sh"], + "image": "bugzilla/bugzilla-ci", + "command": ["runtests.sh"], "env": { "TEST_SUITE": "sanity" }, @@ -54,8 +54,8 @@ "provisionerId": "aws-provisioner-v1", "workerType": "b2gtest", "payload": { - "image": "dklawren/docker-bugzilla", - "command": ["/runtests.sh"], + "image": "bugzilla/bugzilla-ci", + "command": ["runtests.sh"], "env": { "TEST_SUITE": "docs" }, @@ -91,8 +91,8 @@ "provisionerId": "aws-provisioner-v1", "workerType": "b2gtest", "payload": { - "image": "dklawren/docker-bugzilla", - "command": ["/runtests.sh"], + "image": "bugzilla/bugzilla-ci", + "command": ["runtests.sh"], "env": { "TEST_SUITE": "webservices" }, @@ -133,15 +133,15 @@ "provisionerId": "aws-provisioner-v1", "workerType": "b2gtest", "payload": { - "image": "dklawren/docker-bugzilla", - "command": ["/runtests.sh"], + "image": "bugzilla/bugzilla-ci", + "command": ["runtests.sh"], "env": { "TEST_SUITE": "selenium" }, "artifacts": { "public/runtests_log": { "type": "file", - "path": "/runtests.log", + "path": "/tmp/runtests.log", "expires": "2018-02-17T17:33:38.806Z" }, "public/httpd_error_log": { @@ -151,7 +151,7 @@ }, "public/selenium_log": { "type": "file", - "path": "/selenium.log", + "path": "/tmp/selenium.log", "expires": "2018-02-17T17:33:38.806Z" } } @@ -180,15 +180,16 @@ "provisionerId": "aws-provisioner-v1", "workerType": "b2gtest", "payload": { - "image": "dklawren/docker-bugzilla:pgsql", - "command": ["/runtests.sh"], + "image": "bugzilla/bugzilla-ci", + "command": ["runtests.sh"], "env": { + "BUGS_DB_DRIVER": "pg", "TEST_SUITE": "webservices" }, "artifacts": { "public/runtests_log": { "type": "file", - "path": "/runtests.log", + "path": "/tmp/runtests.log", "expires": "2018-02-17T17:33:38.806Z" }, "public/httpd_error_log": { @@ -222,15 +223,16 @@ "provisionerId": "aws-provisioner-v1", "workerType": "b2gtest", "payload": { - "image": "dklawren/docker-bugzilla:pgsql", - "command": ["/runtests.sh"], + "image": "bugzilla/bugzilla-ci", + "command": ["runtests.sh"], "env": { + "BUGS_DB_DRIVER": "pg", "TEST_SUITE": "selenium" }, "artifacts": { "public/runtests_log": { "type": "file", - "path": "/runtests.log", + "path": "/tmp/runtests.log", "expires": "2018-02-17T17:33:38.806Z" }, "public/httpd_error_log": { @@ -240,7 +242,7 @@ }, "public/selenium_log": { "type": "file", - "path": "/selenium.log", + "path": "/tmp/selenium.log", "expires": "2018-02-17T17:33:38.806Z" } } |