diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-17 17:56:07 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-17 17:56:07 +0200 |
| commit | e37461979a5eb890975125134e7717c470c76a5f (patch) | |
| tree | 72878cf5cc946d0b42f0b1da16fd1bee6150e8a0 | |
| parent | 30ac909f30f58d319b42ed1537664483894b18cd (diff) | |
| parent | 944e2445c437cd71dbce183d214b0875bea9ed71 (diff) | |
| download | gitlab-ce-e37461979a5eb890975125134e7717c470c76a5f.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | doc/raketasks/backup_restore.md | 2 | ||||
| -rw-r--r-- | doc/update/7.3-to-7.4.md | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3cd32a75dde..3739a9a0584 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ v 7.5.0 - API: Add support for Hipchat (Kevin Houdebert) - - Add time zone configuration on gitlab.yml (Sullivan Senechal) + - Add time zone configuration in gitlab.yml (Sullivan Senechal) - Fix LDAP authentication for Git HTTP access - Run 'GC.start' after every EmailsOnPushWorker job - Fix LDAP config lookup for provider 'ldap' @@ -22,7 +22,6 @@ v 7.5.0 - Added a password strength indicator - Change project name and path in one form - Display renamed files in diff views (Vinnie Okada) - - Add timezone configuration to gitlab.yml - Fix raw view for public snippets - Use secret token with GitLab internal API. diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index b4581e2a07a..d2f0d6e7bc1 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -14,7 +14,7 @@ You can only restore a backup to exactly the same version of GitLab that you cre sudo gitlab-rake gitlab:backup:create # if you've installed GitLab from source or using the cookbook -bundle exec rake gitlab:backup:create RAILS_ENV=production +sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ``` Example output: diff --git a/doc/update/7.3-to-7.4.md b/doc/update/7.3-to-7.4.md index 3f471500c82..f8a405c195b 100644 --- a/doc/update/7.3-to-7.4.md +++ b/doc/update/7.3-to-7.4.md @@ -35,8 +35,6 @@ sudo -u git -H git checkout 7-4-stable-ee ### 3. Install libs, migrations, etc. ```bash -cd /home/git/gitlab - # MySQL installations (note: the line below states '--without ... postgres') sudo -u git -H bundle install --without development test postgres --deployment |