Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into grammar_fixes

.pkgr.yml

+user: git
+group: git
+before_precompile: ./bin/pkgr_before_precompile.sh
+targets:
+  debian-7: &wheezy
+    build_dependencies:
+      - libicu-dev
+    dependencies:
+      - libicu48
+      - libpcre3
+      - git
+  ubuntu-12.04: *wheezy
+  ubuntu-14.04:
+    build_dependencies:
+      - libicu-dev
+    dependencies:
+      - libicu52
+      - libpcre3
+      - git

CHANGELOG

@@ -8,6 +8,16 @@ v 6.9.0
   - Fix syntax highlighting for code comments blocks
   - Improve comments loading logic
   - Stop refreshing comments when the tab is hidden
+  - Improve issue and merge request mobile UI (Drew Blessing)
+  - Document how to convert a backup to PostgreSQL
+  - Fix locale bug in backup manager
+  - Fix can not automerge when MR description is too long
+  - Fix wiki backup skip bug
+  - Two Step MR creation process
+  - Remove unwanted files from satellite working directory with git clean -fdx
+  - Accept merge request via API (sponsored by O'Reilly Media)
+  - Add more access checks during API calls
+  - Block SSH access for 'disabled' Active Directory users
 v 6.8.0
   - Ability to at mention users that are participating in issue and merge req. discussion

Gemfile

@@ -152,7 +152,7 @@ gem "rack-attack"
 # Ace editor
 gem 'ace-rails-ap'
-gem "sass-rails"
+gem "sass-rails", '~> 4.0.2'
 gem "coffee-rails"
 gem "uglifier"
 gem "therubyracer"

Gemfile.lock

@@ -2,26 +2,26 @@ GEM
   remote: https://rubygems.org/
   specs:
     ace-rails-ap (2.0.1)
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
+    actionmailer (4.0.5)
+      actionpack (= 4.0.5)
       mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
+    actionpack (4.0.5)
+      activesupport (= 4.0.5)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
+    activemodel (4.0.5)
+      activesupport (= 4.0.5)
       builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
+    activerecord (4.0.5)
+      activemodel (= 4.0.5)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
+      activesupport (= 4.0.5)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.5)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
@@ -162,7 +162,7 @@ GEM
       multi_json
     gitlab-grack (2.0.0.pre)
       rack (~> 1.5.1)
-    gitlab-grit (2.6.5)
+    gitlab-grit (2.6.7)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
@@ -279,7 +279,7 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.5.3)
     minitest (4.7.5)
-    multi_json (1.9.3)
+    multi_json (1.10.0)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
@@ -349,13 +349,13 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.0.5)
+      actionmailer (= 4.0.5)
+      actionpack (= 4.0.5)
+      activerecord (= 4.0.5)
+      activesupport (= 4.0.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
+      railties (= 4.0.5)
       sprockets-rails (~> 2.0.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
@@ -368,9 +368,9 @@ GEM
       i18n
       require_all
       ruby-progressbar
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+    railties (4.0.5)
+      actionpack (= 4.0.5)
+      activesupport (= 4.0.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.12.0)
@@ -427,11 +427,12 @@ GEM
     safe_yaml (0.9.7)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.2.12)
-    sass-rails (4.0.1)
+    sass (3.2.19)
+    sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)
@@ -478,7 +479,7 @@ GEM
       spring (>= 0.9.1)
     spring-commands-spinach (1.0.0)
       spring (>= 0.9.1)
-    sprockets (2.10.1)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -636,7 +637,7 @@ DEPENDENCIES
   redis-rails
   rspec-rails
   sanitize (~> 2.0)
-  sass-rails
+  sass-rails (~> 4.0.2)
   sdoc
   seed-fu
   select2-rails

README.md

@@ -15,7 +15,7 @@
 ### Canonical source
-* The source of GitLab Communinity Edition is [hosted on GitLab Cloud](https://gitlab.com/gitlab-org/gitlab-ce/) and there are mirrors to make [contributing](CONTRIBUTING.md) as easy as possible.
+* The source of GitLab Community Edition is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/) and there are mirrors to make [contributing](CONTRIBUTING.md) as easy as possible.
 ### Code status
@@ -25,6 +25,8 @@
 * [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq)
+* [![PullReview stats](https://www.pullreview.com/gitlab/gitlab-org/gitlab-ce/badges/master.svg?)](https://www.pullreview.com/gitlab.gitlab.com/gitlab-org/gitlab-ce/reviews/master)
+
 ### Resources
 * [GitLab.com](https://www.gitlab.com/) includes information about [subscriptions](https://www.gitlab.com/subscription/), [consultancy](https://www.gitlab.com/consultancy/), the [community](https://www.gitlab.com/community/) and the [hosted GitLab Cloud](https://www.gitlab.com/cloud/).
@@ -33,7 +35,7 @@
 * [GitLab CI](https://www.gitlab.com/gitlab-ci/) is a continuous integration (CI) server that is easy to integrate with GitLab.
-* Unofficial third-party [iPhone app](http://gitlabcontrol.com/)m [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en) and [command line client](https://github.com/drewblessing/gitlab-cli) for GitLab.
+* Unofficial third-party [iPhone app](http://gitlabcontrol.com/), [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en) and [command line client](https://github.com/drewblessing/gitlab-cli) and [Ruby API wrapper](https://github.com/NARKOZ/gitlab) for GitLab.
 ### Requirements
@@ -51,7 +53,7 @@
 * [GitLab packages](https://www.gitlab.com/downloads/) **recommended** These packages contain GitLab and all its depencies (Ruby, PostgreSQL, Redis, Nginx, Unicorn, etc.). They are made with [omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md) that also contains the installation instructions.
-* [GitLab Chef Cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md) This cookbook can be used both for development installations and production installations. If you want to [contribute](CONTRIBUTE.md) to GitLab we suggest you follow the [development installation on a virtual machine with Vagrant](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/development.md) instructions to install all testing dependencies.
+* [GitLab Chef Cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md) This cookbook can be used both for development installations and production installations. If you want to [contribute](CONTRIBUTE.md) to GitLab we suggest you follow the [development installation](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/development.md) instructions to install all testing dependencies.
 * [Manual installation guide](doc/install/installation.md) This guide to set up a production server on Ubuntu offers detailed and complete step-by-step instructions.
@@ -61,6 +63,8 @@
 * [BitNami one-click installers](http://bitnami.com/stack/gitlab) This package contains both GitLab and GitLab CI. It is available as installer, virtual machine or for cloud hosting providers (Amazon Web Services/Azure/etc.).
+* [Cloud 66 deployment and management](http://blog.cloud66.com/installing-gitlab-ubuntu/) Use Cloud 66 to deploy GitLab to your own server or any cloud (eg. DigitalOcean, AWS, Rackspace, GCE) and then manage it with database backups, scaling and more.
+
 #### Unofficial installation methods
 * [GitLab recipes](https://gitlab.com/gitlab-org/gitlab-recipes/) repository with unofficial guides for using GitLab with different software (operating systems, webservers, etc.) than the official version.

VERSION

-6.9.0.pre
+6.9.0.rc1

app/assets/javascripts/notes.js.coffee

@@ -53,6 +53,12 @@ class Notes
     # fetch notes when tab becomes visible
     $(document).on "visibilitychange", @visibilityChange
+    @notes_forms = '.js-main-target-form textarea, .js-discussion-note-form textarea'
+    $(document).on('keypress', @notes_forms, (e)->
+      if e.keyCode == 10 || (e.ctrlKey && e.keyCode == 13)
+        $(@).parents('form').submit()
+    )
+
   cleanBinding: ->
     $(document).off "ajax:success", ".js-main-target-form"
     $(document).off "ajax:success", ".js-discussion-note-form"
@@ -67,6 +73,7 @@ class Notes
     $(document).off "click", ".js-discussion-reply-button"
     $(document).off "click", ".js-add-diff-note-button"
     $(document).off "visibilitychange"
+    $(document).off "keypress", @notes_forms
   initRefresh: ->

app/assets/javascripts/project_users_select.js.coffee

 @projectUsersSelect =
   init: ->
     $('.ajax-project-users-select').each (i, select) ->
-      project_id = $('body').data('project-id')
+      project_id = $(select).data('project-id') || $('body').data('project-id')
       $(select).select2
         placeholder: $(select).data('placeholder') || "Search for a user"

app/assets/stylesheets/generic/files.scss

@@ -11,14 +11,11 @@
   }
   .file-title {
-    background: #DDD;
+    background: #EEE;
     border-bottom: 1px solid #CCC;
     text-shadow: 0 1px 1px #fff;
     margin: 0;
-    font-weight: normal;
-    font-weight: bold;
     text-align: left;
-    color: $style_color;
     padding: 9px 10px;
     .options {
@@ -31,12 +28,15 @@
     }
     .file_name {
-      color: $style_color;
+      font-weight: bold;
+      padding-left: 3px;
       font-size: 14px;
-      text-shadow: 0 1px 1px #fff;
+
       small {
-        color: #999;
+        color: #888;
         font-size: 13px;
+        font-weight: normal;
+        padding-left: 10px;
       }
     }
   }

app/assets/stylesheets/generic/forms.scss

@@ -75,3 +75,26 @@ label {
     width: 200px;
   }
 }
+
+.commit-message-container {
+  background-color: $body-bg;
+  position: relative;
+  font-family: $monospace_font;
+  $left: 12px;
+  .max-width-marker {
+    color: rgba(0, 0, 0, 0.0);
+    font-family: inherit;
+    left: $left;
+    height: 100%;
+    border-right: 1px solid mix($input-border, white);
+    position: absolute;
+    z-index: 1;
+  }
+  > textarea {
+    background-color: rgba(0, 0, 0, 0.0);
+    font-family: inherit;
+    padding-left: $left;
+    position: relative;
+    z-index: 2;
+  }
+}

app/assets/stylesheets/generic/issue_box.scss

@@ -12,41 +12,42 @@
   margin:20px 0;
   background: #FFF;
   border: 1px solid #EEE;
+  @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
   &.issue-box-closed {
-    border-color: #DA4E49;
+    border-color: $border_danger;
     .state {
-      background-color: #f2dede;
-      border-color: #ebccd1;
-      color: #a94442;
+      background-color: $bg_light_danger;
+      border-color: $border_danger;
+      color: $color_danger;
       .state-label {
-        background: #DA4E49;
+        background-color: $bg_danger;
         color: #FFF;
       }
     }
   }
   &.issue-box-merged {
-    border-color: #31708f;
+    border-color: $border_primary;
     .state {
-      background-color: #d9edf7;
-      border-color: #bce8f1;
-      color: #31708f;
+      background-color: $bg_light_primary;
+      border-color: $border_primary;
+      color: $color_primary;
       .state-label {
-        background: #31708f;
+        background-color: $bg_primary;
         color: #FFF;
       }
     }
   }
   &.issue-box-open {
-    border-color: #4A4;
+    border-color: $border_success;
     .state {
-      background-color: #dff0d8;
-      border-color: #d6e9c6;
-      color: #3c763d;
+      background-color: $bg_light_success;
+      border-color: $border_success;
+      color: $color_success;
       .state-label {
-        background: #4A4;
+        background-color: $bg_success;
         color: #FFF;
       }
     }
@@ -70,7 +71,6 @@
   }
   .state {
-    height: 34px;
     border-bottom: 1px solid #DDD;
     line-height: 32px;
   }
@@ -89,6 +89,18 @@
     border: none;
     border-top: 1px solid #eee;
     padding: 15px 25px;
+
+    // Reset text align for children
+    .text-right > * { text-align: left; }
+
+    @media (max-width: $screen-xs-max) {
+      // Don't right align on mobile
+      .text-right { text-align: left; }
+
+      .row .col-md-6 {
+        padding-top: 5px;
+      }
+    }
   }
   .description {
@@ -106,7 +118,11 @@
     padding: 1px 25px;
     text-align: center;
     text-shadow: none;
-    margin-right: 20px;
     display: inline-block;
+    line-height: 34px;
+  }
+
+  .creator {
+    padding: 2px 15px;
   }
 }

app/assets/stylesheets/generic/jquery.scss

@@ -8,7 +8,7 @@
     width: 270px;
     .ui-datepicker-header {
-      background: #EEE;
+      background: #FFF;
       border-color: #DDD;
     }
@@ -19,20 +19,37 @@
   }
   &.ui-autocomplete {
-    @include border-radius(0px);
     border-color: #DDD;
     padding: 0;
+    margin-top: 2px;
+    z-index: 1001;
     .ui-menu-item a {
-      color: #777;
-
-      &:hover {
-        background: $hover;
-        border-color: $primary_color;
-        @include border-radius(0px);
-        color: #333;
-      }
+      padding: 4px 10px;
     }
   }
-}
+  .ui-state-default {
+    border: 1px solid #FFF;
+    background: #FFF;
+    color: #777;
+  }
+
+  .ui-state-highlight {
+    border: 1px solid #EEE;
+    background: #EEE;
+  }
+
+  .ui-state-active {
+    border: 1px solid $bg_style_color;
+    background: $bg_style_color;
+    color: #FFF;
+  }
+
+  .ui-state-hover,
+  .ui-state-focus {
+    border: 1px solid $hover;
+    background: $hover;
+    color: #333;
+  }
+}

app/assets/stylesheets/generic/typography.scss

@@ -47,7 +47,7 @@ a {
     text-decoration: underline;
   }
-  &.dark {
+  &.darken {
     color: $style_color;
   }

app/assets/stylesheets/main/mixins.scss

@@ -41,31 +41,6 @@
  * Prefilled mixins
  * Mixins with fixed values
  */
-@mixin bg-light-gray-gradient {
-  background: #f1f1f1;
-  background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
-  background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
-  background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
-  background-image: -ms-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
-  background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
-}
-
-@mixin bg-gray-gradient {
-  background: #eee;
-  background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
-  background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
-  background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
-  background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);
-  background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
-}
-
-@mixin bg-dark-gray-gradient {
-  background: #eee;
-  background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
-  background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
-  background-image: -ms-linear-gradient(#e9e9e9, #d7d7d7);
-  background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
-}
 @mixin shade {
   @include box-shadow(0 0 3px #ddd);
@@ -77,7 +52,6 @@
 @mixin header-font {
   color: $style_color;
-  text-shadow: 0 1px 1px #FFF;
   font-size: 16px;
   line-height: 44px;
   font-weight: normal;

app/assets/stylesheets/main/variables.scss

@@ -8,6 +8,31 @@ $bg_style_color: #2299BB;
 $list-group-active-bg: $bg_style_color;
 $hover: #D9EDF7;
+/*
+ * Success colors (green)
+ */
+$border_success: #4cae4c;
+$bg_success: #5cb85c;
+$bg_light_success: #dff0d8;
+$color_success: #3c763d;
+
+/*
+ * Danger colors (red)
+ */
+$border_danger: #d43f3a;
+$bg_danger: #d9534f;
+$bg_light_danger: #f2dede;
+$color_danger: #a94442;
+
+/*
+ * Primary colors (blue)
+ */
+$border_primary: #358ebd;
+$bg_primary: #429bca;
+$bg_light_primary: #d9edf7;
+$color_primary: #31708f;
+
+
 /**
  * Commit Diff Colors
  */

app/assets/stylesheets/sections/diff.scss

@@ -4,7 +4,7 @@
   .diff-header {
     @extend .clearfix;
-    background: #DDD;
+    background: #EEE;
     border-bottom: 1px solid #CCC;
     padding: 5px 5px 5px 10px;
     color: #555;
@@ -63,30 +63,21 @@
       }
     }
-    .text-file-parallel div {
-      display: inline-block;
-      padding-bottom: 16px;
-    }
-    .diff-side {
-      overflow-x: scroll;
-      width: 508px;
-    }
-    .diff-side.diff-side-left{
-      overflow-y:hidden;
-    }
-    .diff-side table, td.diff-middle table {
-    }
-    .diff-middle {
-      width: 114px;
-      vertical-align: top;
-      overflow: hidden
+    tr.line_holder.parallel{
+      .old_line, .new_line, .diff_line {
+        min-width: 50px;
+      }
+
+      td.line_content.parallel{
+        width: 50%;
+      }
     }
     .old_line, .new_line, .diff_line {
       margin: 0px;
       padding: 0px;
       border: none;
-      background: #EEE;
+      background: #F5F5F5;
       color: #666;
       padding: 0px 5px;
       border-right: 1px solid #ccc;
@@ -304,15 +295,9 @@
     } //.view.onion-skin
   }
   .view-modes{
-
     padding: 10px;
     text-align: center;
-
-    background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
-    background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
-    background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
-    background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);
-    background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
+    background: #EEE;
     ul, li{
       list-style: none;

app/assets/stylesheets/sections/graph.scss

 .project-network {
-  border: 1px solid #aaa;
-  padding: 1px;
+  border: 1px solid #CCC;
   .tip {
     color: #888;
     font-size: 14px;
     padding: 10px;
     border-bottom: 1px solid #bbb;
-    @include bg-gray-gradient;
+    background: #EEE;
   }
   .network-graph {
-    background: #f1f1f1;
+    background: #FFF;
     height: 500px;
     overflow-y: scroll;
     overflow-x: hidden;

app/assets/stylesheets/sections/header.scss

@@ -14,7 +14,6 @@ header {
       .nav > li > a {
         color: $style_color;
-        text-shadow: 0 1px 0 #fff;
         font-size: 14px;
         line-height: 32px;
         padding: 6px 10px;
@@ -190,7 +189,6 @@ header {
         .nav > li > a {
           color: #AAA;
-          text-shadow: 0 1px 0 #444;
           &:hover, &:focus, &:active {
             background: none;
@@ -224,7 +222,6 @@ header {
           background: image-url('logo-white.png') no-repeat center center;
           background-size: 32px;
           color: #fff;
-          text-shadow: 0 1px 1px #444;
         }
       }
     }
@@ -236,7 +233,6 @@ header {
         }
       }
       color: #fff;
-      text-shadow: 0 1px 1px #444;
     }
   }

app/assets/stylesheets/sections/issues.scss

@@ -45,14 +45,6 @@
   padding: 6px 10px;
   border: 1px solid #ccc;
   @include border-radius(4px);
-
-
-  input.check_all_issues {
-    padding: 0;
-    margin: 0;
-    position: relative;
-    top: 3px;
-  }
 }
 .issues_content {
@@ -143,3 +135,36 @@ form.edit-issue {
     border-color: #E5E5E5;
   }
 }
+
+@media (max-width: $screen-xs-max) {
+  .issue-btn-group {
+    width: 100%;
+    margin-top: 5px;
+
+    .btn-group {
+      width: 100%;
+
+      ul {
+        width: 100%;
+        text-align: center;
+      }
+    }
+
+    .btn {
+      width: 100%;
+      margin-top: -1px;
+
+      &:first-child:not(:last-child) {
+        border-radius: 4px 4px 0 0;
+      }
+
+      &:not(:first-child):not(:last-child) {
+        border-radius: 0;
+      }
+
+      &:last-child:not(:first-child) {
+        border-radius: 0 0 4px 4px;
+      }
+    }
+  }
+}

app/assets/stylesheets/sections/merge_requests.scss

@@ -31,7 +31,6 @@
 .mr_source_commit,
 .mr_target_commit {
-  margin-top: 10px;
   .commit {
     margin: 0;
     padding: 2px 0;
@@ -74,6 +73,10 @@
     .merge-request-info {
       color: #999;
+
+      .merge-request-labels {
+        display: inline-block;
+      }
     }
   }
 }
@@ -112,3 +115,7 @@
     }
   }
 }
+
+.merge-request-show-labels .label {
+  padding: 6px 10px;
+}