Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: isaackuang/gitlabhq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: isaackuang/gitlabhq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5-4-stable
Choose a head ref
  • 12 commits
  • 5 files changed
  • 7 contributors

Commits on Jul 18, 2013

  1. Doc for update from 5.3 to 5.4

    @dzaporozhets
    dzaporozhets committed Jul 18, 2013
    Copy the full SHA
    f24c6e8 View commit details

  2. Update installation.md 

    fixed branch-name (5-3 -> 5-4)
    Lukas Schauer committed Jul 18, 2013
    Copy the full SHA
    7a165d2 View commit details

  3. Merge pull request gitlabhq#4589 from lukas2511/patch-1 

    Update installation.md
    @dzaporozhets
    dzaporozhets committed Jul 18, 2013
    Copy the full SHA
    5487db6 View commit details

Commits on Jul 19, 2013

  1. Update VERSION to 5.4.0

    @dzaporozhets
    dzaporozhets committed Jul 19, 2013
    Copy the full SHA
    a5a7555 View commit details

Commits on Jul 22, 2013

  1. Update references to 5-3-stable in install guide

    @jacobvosmaer
    jacobvosmaer committed Jul 22, 2013
    Copy the full SHA
    94a814d View commit details

Commits on Aug 3, 2013

  1. Bump version of gitlab-shell to 1.5.0 and fix gitlab version typo

    @axilleas
    axilleas committed Aug 3, 2013
    Copy the full SHA
    eab6ce0 View commit details

Commits on Aug 4, 2013

  1. Merge pull request gitlabhq#4611 from axilleas/bump-gitlab-shell-vers… 

    …ion_5-4

Bump version of gitlab-shell to 1.7.0
    @dzaporozhets
    dzaporozhets committed Aug 4, 2013
    Copy the full SHA
    e8d77e2 View commit details

Commits on Aug 17, 2013

  1. Don't restart nginx, just tell it to reload it's config files.

    @Rovanion
    Rovanion committed Aug 17, 2013
    Copy the full SHA
    a906860 View commit details

Commits on Aug 19, 2013

  1. Merge pull request gitlabhq#4801 from Rovanion/patch-3 

    Don't restart nginx, just tell it to reload it's config files.
    @jacobvosmaer
    jacobvosmaer committed Aug 19, 2013
    Copy the full SHA
    aed4e0f View commit details

Commits on Aug 27, 2013

  1. Updated sidekiq Gemfile.lock for celluloid error 

    Should (hopefully fix issue with: "Mysql2::Error: This connection is still waiting for a result, try again once you have the result:"

sidekiq/sidekiq#954
celluloid/celluloid#268

Change-Id: I4daa65b6b6f9de20975d95ba07ffab103ec03204
    @jacobvosmaer
    Izaak Alpert authored and jacobvosmaer committed Aug 27, 2013
    Copy the full SHA
    56a83cd View commit details

  2. Merge branch 'celluloid_update' of /home/git/repositories/gitlab/gitl… 

    …abhq into 5-4-stable
    @dzaporozhets
    dzaporozhets committed Aug 27, 2013
    Copy the full SHA
    9360c73 View commit details

Commits on Sep 25, 2013

  1. Fix for Resque forking might cause stuck workers for the threaded Sid… 

    …ekiq.
    @dosire @jacobvosmaer
    dosire authored and jacobvosmaer committed Sep 25, 2013
    Copy the full SHA
    38cf628 View commit details
Showing with 92 additions and 48 deletions.
  1. +4 −4 Gemfile.lock
  2. +1 −1 VERSION
  3. +0 −36 config/initializers/connection_fix.rb
  4. +7 −7 doc/install/installation.md
  5. +80 −0 doc/update/5.3-to-5.4.md
8 changes: 4 additions & 4 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ GEM
carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
celluloid (0.14.0)
celluloid (0.14.1)
timers (>= 1.0.0)
charlock_holmes (0.6.9.4)
childprocess (0.3.9)
@@ -87,7 +87,7 @@ GEM
coffee-script-source (1.6.2)
colored (1.2)
colorize (0.5.8)
connection_pool (1.0.0)
connection_pool (1.1.0)
coveralls (0.6.7)
colorize
multi_json (~> 1.3)
@@ -445,8 +445,8 @@ GEM
sexp_processor (4.2.1)
shoulda-matchers (2.1.0)
activesupport (>= 3.0.0)
sidekiq (2.12.0)
celluloid (>= 0.14.0)
sidekiq (2.12.4)
celluloid (>= 0.14.1)
connection_pool (>= 1.0.0)
json
redis (>= 3.0)
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.4.0.rc1
5.4.0
36 changes: 0 additions & 36 deletions config/initializers/connection_fix.rb
View file

This file was deleted.

14 changes: 7 additions & 7 deletions doc/install/installation.md
View file
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@ GitLab Shell is a ssh access and repository management software developed specia
cd gitlab-shell

# switch to right version
sudo -u git -H git checkout v1.4.0
sudo -u git -H git checkout v1.5.0

sudo -u git -H cp config.yml.example config.yml

@@ -150,10 +150,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
cd /home/git/gitlab

# Checkout to stable release
sudo -u git -H git checkout 5-3-stable
sudo -u git -H git checkout 5-4-stable

**Note:**
You can change `5-3-stable` to `master` if you want the *bleeding edge* version, but do so with caution!
You can change `5-4-stable` to `master` if you want the *bleeding edge* version, but do so with caution!

## Configure it

@@ -301,7 +301,7 @@ Make sure to edit the config file to match your setup:

## Restart

sudo service nginx restart
sudo service nginx reload


# Done!
@@ -357,10 +357,10 @@ GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already

These steps are fairly general and you will need to figure out the exact details from the Omniauth provider's documentation.

* Add `gem "omniauth-your-auth-provider"` to the [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/5-3-stable/Gemfile#L18)
* Add `gem "omniauth-your-auth-provider"` to the [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/5-4-stable/Gemfile#L19)
* Run `sudo -u git -H bundle install` to install the new gem(s)
* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://github.com/gitlabhq/gitlabhq/blob/5-3-stable/config/gitlab.yml.example#L53) as a reference)
* Add icons for the new provider into the [vendor/assets/images/authbuttons](https://github.com/gitlabhq/gitlabhq/tree/5-3-stable/vendor/assets/images/authbuttons) directory (you can find some more popular ones over at https://github.com/intridea/authbuttons)
* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://github.com/gitlabhq/gitlabhq/blob/5-4-stable/config/gitlab.yml.example#L113) as a reference)
* Add icons for the new provider into the [vendor/assets/images/authbuttons](https://github.com/gitlabhq/gitlabhq/tree/5-4-stable/vendor/assets/images/authbuttons) directory (you can find some more popular ones over at https://github.com/intridea/authbuttons)
* Restart GitLab

### Examples
80 changes: 80 additions & 0 deletions doc/update/5.3-to-5.4.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# From 5.3 to 5.4

### 0. Backup

It's useful to make a backup just in case things go south:
(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)

```bash
cd /home/git/gitlab
sudo -u git -H RAILS_ENV=production bundle exec rake gitlab:backup:create
```

### 1. Stop server

sudo service gitlab stop

### 2. Get latest code

```bash
cd /home/git/gitlab
sudo -u git -H git fetch
sudo -u git -H git checkout 5-4-stable
```

### 3. Install libs, migrations, etc.

```bash
cd /home/git/gitlab

# MySQL
sudo -u git -H bundle install --without development test postgres --deployment

#PostgreSQL
sudo -u git -H bundle install --without development test mysql --deployment

sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
```

### 4. Update config files

* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/5-4-stable/config/gitlab.yml.example but with your settings.
* Make `/home/git/gitlab/config/puma.rb` same as https://github.com/gitlabhq/gitlabhq/blob/5-4-stable/config/puma.rb.example but with your settings.

### 5. Update Init script

```bash
sudo rm /etc/init.d/gitlab
sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5-4-stable/lib/support/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```

### 6. Start application

sudo service gitlab start
sudo service nginx restart

### 7. Check application status

Check if GitLab and its environment are configured correctly:

sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production

To make sure you didn't miss anything run a more thorough check with:

sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production

If all items are green, then congratulations upgrade complete!

## Things went south? Revert to previous version (5.3)

### 1. Revert the code to the previous version
Follow the [`upgrade guide from 5.2 to 5.3`](5.2-to-5.3.md), except for the database migration
(The backup is already migrated to the previous version)

### 2. Restore from the backup:

```bash
cd /home/git/gitlab
sudo -u git -H RAILS_ENV=production bundle exec rake gitlab:backup:restore
```