summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-20 17:37:37 +0200
committerRémy Coutable <remy@rymai.me>2016-09-21 12:40:40 +0200
commitf60c82d0b53eb342efa6ea857deca0e191bb588b (patch)
treee4b6baed6c2681b2b89997387aa501ba90430862
parentbcd02e0d75d7a934ee18d11643c1eaca434cf17b (diff)
downloadgitlab-ce-f60c82d0b53eb342efa6ea857deca0e191bb588b.tar.gz
Merge branch 'JonTheNiceGuy/gitlab-ce-Ubuntu-16.04-Package'
See gitlab-org/gitlab-ce!6247. Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.pkgr.yml12
-rw-r--r--CHANGELOG2
2 files changed, 14 insertions, 0 deletions
diff --git a/.pkgr.yml b/.pkgr.yml
index 8fc9fddf8f7..10bcd7bd4bd 100644
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -3,6 +3,8 @@ group: git
services:
- postgres
before_precompile: ./bin/pkgr_before_precompile.sh
+env:
+ - SKIP_STORAGE_VALIDATION=true
targets:
debian-7: &wheezy
build_dependencies:
@@ -25,6 +27,16 @@ targets:
- libicu52
- libpcre3
- git
+ ubuntu-16.04:
+ build_dependencies:
+ - libkrb5-dev
+ - libicu-dev
+ - cmake
+ - pkg-config
+ dependencies:
+ - libicu55
+ - libpcre3
+ - git
centos-6:
build_dependencies:
- krb5-devel
diff --git a/CHANGELOG b/CHANGELOG
index 088f9ee44f1..a3b42782806 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ v 8.12.0 (unreleased)
- Prune events older than 12 months. (ritave)
- Prepend blank line to `Closes` message on merge request linked to issue (lukehowell)
- Fix issues/merge-request templates dropdown for forked projects
+ - Amends the packager.io configuration file to create a build for Ubuntu 16.04. !6247 (Jon "The Nice Guy" Spriggs)
- Filter tags by name !6121
- Update gitlab shell secret file also when it is empty. !3774 (glensc)
- Give project selection dropdowns responsive width, make non-wrapping.
@@ -94,6 +95,7 @@ v 8.12.0 (unreleased)
- Add hover state to todos !5361 (winniehell)
- Fix icon alignment of star and fork buttons !5451 (winniehell)
- Fix alignment of icon buttons !5887 (winniehell)
+ - Added Ubuntu 16.04 support for packager.io (JonTheNiceGuy)
- Fix markdown help references (ClemMakesApps)
- Add last commit time to repo view (ClemMakesApps)
- Fix accessibility and visibility of project list dropdown button !6140