Skip to content
Snippets Groups Projects
Commit a063b0b1 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch '7-7-stable'

Conflicts:
	config/software/gitlab-ci.rb
	config/software/gitlab-rails.rb
parents 15d04cf4 c351937b
No related branches found
No related tags found
No related merge requests found
......@@ -46,3 +46,6 @@
s3_sync:
aws s3 sync pkg/ s3://${RELEASE_BUCKET} --acl public-read --region ${RELEASE_BUCKET_REGION}
# empty line for aws status crud
# Download URLS:
find pkg -type f | sed "s|pkg|https://${RELEASE_BUCKET}.s3.amazonaws.com|"
......@@ -16,7 +16,7 @@
#
name "gitlab-ci"
default_version "91358db470269a76f4ca0bbe988d2c0e6c8b41e5" # 5.4.3.rc1
default_version "0664a64c8fd96f69d43611491faa70aaf545daa7" # CI 5.4.0
EE = system("#{Config.project_root}/support/is_gitlab_ee.sh")
......
......@@ -17,7 +17,7 @@
#
name "gitlab-rails"
default_version "ece32141fbd9237295224afdd3cf7628a18045ab" # CE 7.7.0.rc4
default_version "c04f11dab5b8890278f9fe3b47729353cded1c54" # CE 7.7.0
EE = system("#{Config.project_root}/support/is_gitlab_ee.sh")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment