summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2014-07-10 14:32:45 +0100
committerMichael Drake <michael.drake@codethink.co.uk>2014-07-10 14:32:45 +0100
commit9494d423e733d15991cc0300f95a5671de755400 (patch)
tree22898ae9b72feadfe28ea60fe42ca45e6adae6f3
parent258e4cd11b317563052d3b1784cefa2b3a7db978 (diff)
parentd68be63305298b3383f758f84ead3ecaa3196043 (diff)
downloaddefinitions-9494d423e733d15991cc0300f95a5671de755400.tar.gz
Merge branch 'baserock/michaeldrake/gitlab-7'
Reviewed-by: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
-rw-r--r--gitlab.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitlab.morph b/gitlab.morph
index a731290a..bc345e1e 100644
--- a/gitlab.morph
+++ b/gitlab.morph
@@ -6,8 +6,8 @@ build-depends:
chunks:
- name: gitlab-ce
repo: upstream:gitlab/gitlab-ce
- ref: cdec1324173c2331153b671ef6ebab749bca9cd4
- unpetrify-ref: baserock/morph
+ ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425
+ unpetrify-ref: baserock/v7.0.0
build-depends: []
- name: gitlab-ci
repo: upstream:gitlab/gitlab-ci