Merge branch 'master' into master

Dockerfile

@@ -1,4 +1,4 @@
-FROM sameersbn/ubuntu:14.04.20170503
+FROM sameersbn/ubuntu:14.04.20170608
 MAINTAINER sameer@damagehead.com
 
 ENV GITLAB_VERSION=9.3.0 \

README.md

@@ -848,6 +848,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_SHARED_DIR` | The directory to store the build artifacts. Defaults to `/home/git/data/shared` |
 | `GITLAB_ARTIFACTS_ENABLED` | Enable/Disable GitLab artifacts support. Defaults to `true`. |
 | `GITLAB_ARTIFACTS_DIR` | Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` |
+| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the Gitlab pipeline schedule worker. Defaults to `'0 */12 * * *'` |
 | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. |
 | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` |
 | `GITLAB_MATTERMOST_ENABLED` | Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`. |
@@ -905,6 +906,7 @@ Below is the complete list of available options that can be used to customize yo
 | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) |
 | `DB_ADAPTER` | The database type. Possible values: `mysql2`, `postgresql`. Defaults to `postgresql`. |
 | `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` and `mysql2`, this parameter defaults to `unicode` and `utf8` respectively. |
+| `DB_COLLATION` | The database collation. Defaults to `utf8_general_ci` for `DB_ADAPTER` `mysql2`. This parameter is not supported for `DB_ADAPTER` `postresql` and will be removed. |
 | `DB_HOST` | The database server hostname. Defaults to `localhost`. |
 | `DB_PORT` | The database server port. Defaults to `3306` for mysql and `5432` for postgresql. |
 | `DB_NAME` | The database database name. Defaults to `gitlabhq_production` |

assets/runtime/config/gitlabhq/database.yml

@@ -4,7 +4,7 @@
 production:
   adapter: {{DB_ADAPTER}}
   encoding: {{DB_ENCODING}}
-  collation: utf8_general_ci
+  collation: {{DB_COLLATION}}
   reconnect: false
   database: {{DB_NAME}}
   host: {{DB_HOST}}

assets/runtime/config/gitlabhq/gitlab.yml

@@ -193,7 +193,7 @@ production: &base
       cron: "0 * * * *"
     # Execute scheduled triggers
     pipeline_schedule_worker:
-      cron: "19 * * * *"
+      cron: {{GITLAB_PIPELINE_SCHEDULE_WORKER_CRON}}
     # Remove expired build artifacts
     expire_build_artifacts_worker:
       cron: "50 * * * *"
@@ -204,7 +204,6 @@ production: &base
     # Send admin emails once a week
     admin_email_worker:
       cron: "0 0 * * 0"
-
     # Remove outdated repository archives
     repository_archive_cache_worker:
       cron: "0 * * * *"

assets/runtime/env-defaults

@@ -34,6 +34,7 @@ NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-31536000}
 ## DATABASE
 DB_ADAPTER=${DB_ADAPTER:-}
 DB_ENCODING=${DB_ENCODING:-}
+DB_COLLATION=${DB_COLLATION:-}
 DB_HOST=${DB_HOST:-}
 DB_PORT=${DB_PORT:-}
 DB_NAME=${DB_NAME:-}
@@ -101,6 +102,9 @@ GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s}
 GITLAB_ARTIFACTS_ENABLED=${GITLAB_ARTIFACTS_ENABLED:-true}
 GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}"
 
+## Cron Jobs
+GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-'0 */12 * * *'}
+
 ## LFS
 GITLAB_LFS_ENABLED=${GITLAB_LFS_ENABLED:-true}
 GITLAB_LFS_OBJECTS_DIR="${GITLAB_LFS_OBJECTS_DIR:-$GITLAB_SHARED_DIR/lfs-objects}"

assets/runtime/functions

@@ -151,10 +151,12 @@ gitlab_finalize_database_parameters() {
   case ${DB_ADAPTER} in
     mysql2)
       DB_ENCODING=${DB_ENCODING:-utf8}
+      DB_COLLATION=${DB_COLLATION:-utf8_general_ci}
       DB_PORT=${DB_PORT:-3306}
       ;;
     postgresql)
       DB_ENCODING=${DB_ENCODING:-unicode}
+      # DB_COLLATION: Not supported for postgresql and will be removed below.
       DB_PORT=${DB_PORT:-5432}
       ;;
     *)
@@ -206,6 +208,7 @@ gitlab_configure_database() {
   update_template ${GITLAB_DATABASE_CONFIG} \
     DB_ADAPTER \
     DB_ENCODING \
+    DB_COLLATION \
     DB_HOST \
     DB_PORT \
     DB_NAME \
@@ -839,6 +842,16 @@ gitlab_configure_gravatar() {
   fi
 }
 
+gitlab_configure_cron_jobs() {
+  echo "Configuring gitlab::cron_jobs..."
+  
+  if [[ -n ${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON} ]]; then
+    update_template ${GITLAB_CONFIG} GITLAB_PIPELINE_SCHEDULE_WORKER_CRON
+  else
+    exec_as_git sed -i "/{{GITLAB_PIPELINE_SCHEDULE_WORKER_CRON}}/d" ${GITLAB_CONFIG}
+  fi
+}
+
 gitlab_configure_analytics_google() {
   if [[ -n ${GOOGLE_ANALYTICS_ID} ]]; then
   echo "Configuring gitlab::analytics:google..."
@@ -1400,6 +1413,7 @@ configure_gitlab() {
   gitlab_configure_oauth
   gitlab_configure_ldap
   gitlab_configure_gravatar
+  gitlab_configure_cron_jobs
   gitlab_configure_analytics
   gitlab_configure_backups
   gitlab_configure_registry