Merge branch 'feature/gitlab-6.8.0'

Changelog.md

@@ -1,6 +1,9 @@
 # Changelog
 
-**latest**
+**6.8.0**
+- upgrade to gitlab-shell 1.9.3
+- added GITLAB_SIGNIN setting to enable or disable standard login form
+- upgraded to gitlab-ce version 6.8.0
 - added support for linking with redis container.
 - use sameersbn/ubuntu as the base docker image
 - install postgresql-client to fix restoring backups when used with a postgresql database backend.

README.md

@@ -42,7 +42,7 @@
 Dockerfile to build a GitLab container image.
 
 ## Version
-Current Version: 6.7.5
+Current Version: 6.8.0
 
 # Hardware Requirements
 
@@ -91,7 +91,7 @@ docker pull sameersbn/gitlab:latest
 Since version 6.3.0, the image builds are being tagged. You can now pull a particular version of gitlab by specifying the version number. For example,
 
 ```bash
-docker pull sameersbn/gitlab:6.7.5
+docker pull sameersbn/gitlab:6.8.0
 ```
 
 Alternately you can build the image yourself.
@@ -452,6 +452,7 @@ Below is the complete list of available options that can be used to customize yo
 - **GITLAB_EMAIL**: The email address for the GitLab server. Defaults to gitlab@localhost.
 - **GITLAB_SUPPORT**: The support email address for the GitLab server. Defaults to support@localhost.
 - **GITLAB_SIGNUP**: Enable or disable user signups. Default is false.
+- **GITLAB_SIGNIN**: If set to false, standard login form won't be shown on the sign-in page. Default is true.
 - **GITLAB_PROJECTS_LIMIT**: Set default projects limit. Defaults to 10.
 - **GITLAB_BACKUPS**: Setup cron job to automatic backups. Possible values disable, daily or monthly. Disabled by default
 - **GITLAB_BACKUP_EXPIRY**: Configure how long to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds).

assets/config/gitlabhq/gitlab.yml

@@ -20,7 +20,7 @@ production: &base
     https: {{GITLAB_HTTPS}}
 
     # Uncomment and customize the last line to run in a non-root path
-    # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. 
+    # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
     # Note that four settings need to be changed for this to work.
     # 1) In your application.rb file: config.relative_url_root = "/gitlab"
     # 2) In your gitlab.yml file: relative_url_root: /gitlab
@@ -54,8 +54,12 @@ production: &base
 
 
     ## Users management
-    # default: false - Account passwords are not sent via the email if signup is enabled. 
+    # default: false - Account passwords are not sent via the email if signup is enabled.
     signup_enabled: {{GITLAB_SIGNUP}}
+    #
+    # default: true - If set to false, standard login form won't be shown on the sign-in page
+    signin_enabled: {{GITLAB_SIGNIN}}
+
 
     # Restrict setting visibility levels for non-admin users.
     # The default is to allow all levels.
@@ -65,7 +69,7 @@ production: &base
     # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
     # This happens when the commit is pushed or merged into the default branch of a project.
     # When not specified the default issue_closing_pattern as specified below will be used.
-    # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) +#\d+'
+    # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)'
 
     ## Default project features settings
     default_projects_features:
@@ -76,6 +80,11 @@ production: &base
       snippets: false
       visibility_level: "private"  # can be "private" | "internal" | "public"
 
+    ## Repository downloads directory
+    # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
+    # The default is 'tmp/repositories' relative to the root of the Rails app.
+    # repository_downloads_path: tmp/repositories
+
   ## External issues trackers
   issues_tracker:
     # redmine:
@@ -98,7 +107,7 @@ production: &base
     #   ##  :project_id        - GitLab project identifier
     #   ##  :issues_tracker_id - Project Name or Id in external issue tracker
     #   new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"
-    # 
+    #
     # jira:
     #   title: "Atlassian Jira"
     #   project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"
@@ -166,9 +175,10 @@ production: &base
     ## Auth providers
     # Uncomment the following lines and fill in the data of the auth provider you want to use
     # If your favorite auth provider is not listed you can use others:
-    # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Working-custom-omniauth-provider-configurations
+    # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Custom-omniauth-provider-configurations
     # The 'app_id' and 'app_secret' parameters are always passed as the first two
     # arguments, followed by optional 'args' which can be either a hash or an array.
+    # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html
     providers:
       # - { name: 'google_oauth2', app_id: 'YOUR APP ID',
       #     app_secret: 'YOUR APP SECRET',

assets/config/nginx/gitlab

@@ -42,6 +42,10 @@ server {
   # if a file, which is not found in the root folder is requested,
   # then the proxy pass the request to the upsteam (gitlab unicorn)
   location @gitlab {
+    # If you use https make sure you disable gzip compression 
+    # to be safe against BREACH attack
+    # gzip off;
+
     proxy_read_timeout 300; # Some requests take more than 30 seconds.
     proxy_connect_timeout 300; # Some requests take more than 30 seconds.
     proxy_redirect     off;
@@ -54,6 +58,13 @@ server {
     proxy_pass http://gitlab;
   }
 
-  error_page 502 /502.html;
-}
+  # Enable gzip compression as per rails guide: http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
+  location ~ ^/(assets)/  {
+    root /home/git/gitlab/public;
+    gzip_static on; # to serve pre-gzipped version
+    expires max;
+    add_header Cache-Control public;
+  }
 
+  error_page 502 /502.html;
+}

assets/init

@@ -7,6 +7,7 @@ GITLAB_HTTPS=${GITLAB_HTTPS:-false}
 GITLAB_EMAIL=${GITLAB_EMAIL:-gitlab@localhost}
 GITLAB_SUPPORT=${GITLAB_SUPPORT:-support@localhost}
 GITLAB_SIGNUP=${GITLAB_SIGNUP:-false}
+GITLAB_SIGNIN=${GITLAB_SIGNIN:-true}
 GITLAB_PROJECTS_LIMIT=${GITLAB_PROJECTS_LIMIT:-10}
 
 GITLAB_BACKUPS=${GITLAB_BACKUPS:-disable}
@@ -189,6 +190,7 @@ sudo -u git -H sed 's/{{GITLAB_SHELL_SSH_PORT}}/'"${GITLAB_SHELL_SSH_PORT}"'/' -
 
 # configure gitlab signup configuration
 sudo -u git -H sed 's/{{GITLAB_SIGNUP}}/'"${GITLAB_SIGNUP}"'/' -i /home/git/gitlab/config/gitlab.yml
+sudo -u git -H sed 's/{{GITLAB_SIGNIN}}/'"${GITLAB_SIGNIN}"'/' -i /home/git/gitlab/config/gitlab.yml
 
 # configure gitlab default_projects_limit
 sudo -u git -H sed 's/{{GITLAB_PROJECTS_LIMIT}}/'"${GITLAB_PROJECTS_LIMIT}"'/' -i /home/git/gitlab/config/gitlab.yml
@@ -264,7 +266,7 @@ chown git:git /home/git/data/repositories
 
 # create the satellites directory and make sure it has the right permissions
 sudo -u git -H mkdir -p /home/git/data/gitlab-satellites/
-sudo chmod ug+rwX,o-rwx /home/git/data/gitlab-satellites/
+sudo chmod u+rwx,g+rx,o-rwx /home/git/data/gitlab-satellites/
 sudo chmod ug-s /home/git/data/gitlab-satellites/
 find /home/git/data/gitlab-satellites/ -type d -print0 | sudo xargs -0 chmod g+s
 chown git:git /home/git/data/gitlab-satellites

assets/setup/install

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-GITLAB_VERSION=6.7.5
-SHELL_VERSION=1.9.1
+GITLAB_VERSION=6.8.0
+SHELL_VERSION=1.9.3
 
 # add git user
 adduser --disabled-login --gecos 'GitLab' git