Merge branch 'gitlab-next'

Changelog.md

@@ -4,6 +4,8 @@
 - init: added GOOGLE_ANALYTICS_ID configuration option
 - added support for mantis issue tracker
 - fixed log rotation configuration
+- gitlab-shell: upgrade to v.2.4.1
+- gitlab: upgrade to CE v.7.7.0
 
 **7.6.2**
 - gitlab: upgrade to CE v.7.6.2

VERSION

@@ -1 +1 @@
-7.6.2
+7.7.0

assets/config/gitlabhq/gitlab.yml

@@ -304,6 +304,20 @@ production: &base
     #   ![Company Logo](http://www.companydomain.com/logo.png)
     #   [Learn more about CompanyName](http://www.companydomain.com/)
 
+  rack_attack:
+    git_basic_auth:
+      # Whitelist requests from 127.0.0.1 for web proxies (NGINX/Apache) with incorrect headers
+      # ip_whitelist: ["127.0.0.1"]
+      #
+      # Limit the number of Git HTTP authentication attempts per IP
+      # maxretry: 10
+      #
+      # Reset the auth attempt counter per IP after 60 seconds
+      # findtime: 60
+      #
+      # Ban an IP for one hour (3600s) after too many auth attempts
+      # bantime: 3600
+
 development:
   <<: *base
 

assets/setup/install

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-GITLAB_VERSION=7.6.2
-GITLAB_SHELL_VERSION=2.4.0
+GITLAB_VERSION=7.7.0
+GITLAB_SHELL_VERSION=2.4.1
 
 GITLAB_HOME="/home/git"
 GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab"