heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
Conflicts:
	docs/source/siteadmin/deploying.rst
	docs/source/siteadmin/relnotes.rst
This commit is contained in:
Christopher Allan Webber 2015-04-17 17:09:06 -05:00
commit a35b7c7fb3
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/source/siteadmin/deploying.rst
View File

@ -210,10 +210,17 @@ Change to the MediaGoblin directory that you just created::
Clone the MediaGoblin repository and set up the git submodules:: Clone the MediaGoblin repository and set up the git submodules::
$ git clone https://gitorious.org/mediagoblin/mediagoblin.git -b stable $ git clone git://git.savannah.gnu.org/mediagoblin.git -b stable
$ cd mediagoblin $ cd mediagoblin
$ git submodule init && git submodule update $ git submodule init && git submodule update
.. note::
The MediaGoblin repository used to be on gitorious.org, but since
gitorious.org shut down, we had to move. We are presently on
Savannah. You may need to update your git repository location::
git remote set-url origin git://git.savannah.gnu.org/mediagoblin.git
Set up the hacking environment:: Set up the hacking environment::

21
docs/source/siteadmin/relnotes.rst
View File

@ -21,12 +21,23 @@ This chapter has important information for releases in it.
If you're upgrading from a previous release, please read it If you're upgrading from a previous release, please read it
carefully, or at least skim over it. carefully, or at least skim over it.
**NOTE:** ALWAYS do backups before upgrading, especially before .. note::
running migrations! That way if something goes wrong, we can fix
things! ALWAYS do backups before upgrading, especially before
running migrations! That way if something goes wrong, we can fix
things!
And be sure to shut down your current mediagoblin/celery processes
before upgrading!
.. note::
The MediaGoblin repository used to be on gitorious.org, but since
gitorious.org shut down, we had to move. We are presently on
Savannah. You may need to update your git repository location::
git remote set-url origin git://git.savannah.gnu.org/mediagoblin.git
And be sure to shut down your current mediagoblin/celery processes
before upgrading!
0.7.1 0.7.1
===== =====