bcfa59bf82
Updates gitlab to the current stable version and fixes a lot of features that were broken, at least with the current version and our configuration. Quite a lot of sweat and tears has gone into testing nearly all features and reading/patching the Gitlab source as we're about to deploy gitlab for our whole company. Things to note: * The gitlab config is now written as a nix attribute set and will be converted to JSON. Gitlab uses YAML but JSON is a subset of YAML. The `extraConfig` opition is also an attribute set that will be merged with the default config. This way *all* Gitlab options are supported. * Some paths like uploads and configs are hardcoded in rails (at least after my study of the Gitlab source). This is why they are linked from the Gitlab root to /run/gitlab and then linked to the configurable `statePath`. * Backup & restore should work out of the box from another Gitlab instance. * gitlab-git-http-server has been replaced by gitlab-workhorse upstream. Push & pull over HTTPS works perfectly. Communication to gitlab is done over unix sockets. An HTTP server is required to proxy requests to gitlab-workhorse over another unix socket at `/run/gitlab/gitlab-workhorse.socket`. * The user & group running gitlab are now configurable. These can even be changed for live instances. * The initial email address & password of the root user can be configured. Fixes #8598.
29 lines
815 B
Diff
29 lines
815 B
Diff
index acd1874..f493451 100644
|
|
--- a/Gemfile
|
|
+++ b/Gemfile
|
|
@@ -318,3 +318,5 @@ gem 'oauth2', '~> 1.0.0'
|
|
|
|
# Soft deletion
|
|
gem "paranoia", "~> 2.0"
|
|
+
|
|
+gem "activerecord-nulldb-adapter"
|
|
index 14d2c76..7a010f0 100644
|
|
--- a/Gemfile.lock
|
|
+++ b/Gemfile.lock
|
|
@@ -34,6 +34,8 @@ GEM
|
|
activesupport (= 4.2.5.1)
|
|
arel (~> 6.0)
|
|
activerecord-deprecated_finders (1.0.4)
|
|
+ activerecord-nulldb-adapter (0.3.2)
|
|
+ activerecord (>= 2.0.0)
|
|
activerecord-session_store (0.1.2)
|
|
actionpack (>= 4.0.0, < 5)
|
|
activerecord (>= 4.0.0, < 5)
|
|
@@ -880,6 +882,7 @@ DEPENDENCIES
|
|
RedCloth (~> 4.2.9)
|
|
ace-rails-ap (~> 2.0.1)
|
|
activerecord-deprecated_finders (~> 1.0.3)
|
|
+ activerecord-nulldb-adapter
|
|
activerecord-session_store (~> 0.1.0)
|
|
acts-as-taggable-on (~> 3.4)
|
|
addressable (~> 2.3.8)
|