Merge branch 'master' into karlhungus-mr-on-fork

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

.gitignore

@@ -30,3 +30,5 @@ vendor/bundle/*
 rails_best_practices_output.html
 doc/code/*
 .secret
+*.log
+public/uploads.*

CONTRIBUTING.md

@@ -2,6 +2,12 @@
 This guide details how to use issues and pull requests to improve GitLab.
+-  [Closing policy for issues and pull requests](#closing-policy-for-issues-and-pull-requests)
+-  [Issue tracker](#issue-tracker)
+-  [Pull requests](#pull-requests)
+
+If you want to know how the GitLab team handles contributions have a look at [the GitLab contributing process](PROCESS.md).
+
 ## Closing policy for issues and pull requests
 GitLab is a popular open source project and the capacity to deal with issues and pull requests is limited. Out of respect for our volunteers, issues and pull requests not in line with the guidelines listed in this document may be closed without notice.

Gemfile

@@ -23,7 +23,7 @@ gem 'omniauth-github'
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem 'gitlab_git', '~> 1.4.1'
+gem "gitlab_git", "~> 2.0.0.pre"
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 1.0.1', require: 'grack'

Gemfile.lock

@@ -176,7 +176,7 @@ GEM
     gitlab-pygments.rb (0.3.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    gitlab_git (1.4.1)
+    gitlab_git (2.0.0.pre)
       activesupport (~> 3.2.13)
       github-linguist (~> 2.3.4)
       gitlab-grit (~> 2.6.0)
@@ -275,7 +275,7 @@ GEM
     minitest (4.7.4)
     modernizr (2.6.2)
       sprockets (~> 2.0)
-    multi_json (1.7.7)
+    multi_json (1.7.8)
     multi_xml (0.5.4)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
@@ -568,7 +568,7 @@ DEPENDENCIES
   gitlab-gollum-lib (~> 1.0.1)
   gitlab-grack (~> 1.0.1)
   gitlab-pygments.rb (~> 0.3.2)
-  gitlab_git (~> 1.4.1)
+  gitlab_git (~> 2.0.0.pre)
   gitlab_meta (= 6.0)
   gitlab_omniauth-ldap (= 1.0.3)
   gon

PROCESS.md

+# GitLab Contributing Process
+
+## Purpose of describing the contributing process
+
+Below we describe the contributing process for two reasons. Contributors know what to expect from maintainers (initial, response within xx days, friendly treatment, etc). And maintainers know what to expect from contributors (use latest version, confirm the issue is addressed, friendly treatment, etc).
+
+## How we handle issues
+
+The priority should be mentioning people that can help and assigning workflow labels. Workflow labels are purposely not very detailed since that would be hard to keep updated as you would need to reevaluate them after every comment. We optionally use functional labels on demand when want to group related issues to get an overview (for example all issues related to RVM, to tackle them in one go) and to add details to the issue. 
+
+If an issue is complex and needs the attention of a specific person, assignment is a good option but assigning issues might discourage other people from contributing to that issue. We need all the contributions we can get so this should never be discouraged. Also, an assigned person might not have time for a few weeks, so others should feel free to takeover. 
+
+Priority (from high to low):
+
+1. Mentioning people (very important)
+2. Workflow labels
+3. Functional labels (less important)
+4. Assigning issues (optional)
+
+## Workflow labels
+
+- _Awaiting feedback_: Feedback pending from the reporter
+- _Awaiting confirmation of fix_: The issue should already be solved in **master** (generally you can avoid this workflow item and just close the issue right away)
+- _Attached PR_: There is a PR attached and the discussion should happen there
+  - We need to let issues stay in sync with the PR's. We can do this with a "Closing #XXXX" or "Fixes #XXXX" comment in the PR. We can't close the issue when there is a pull request because sometimes a PR is not good and we just close the PR, then the issue must stay.
+- _Awaiting developer action/feedback_: Issue needs to be fixed or clarified by a developer
+
+## Functional labels
+
+These labels describe what development specialities are involved such as: PostgreSQL, UX, LDAP.
+
+## Label colors
+- Light orange `#fef2c0`: workflow labels for issue team members (awaiting feedback, awaiting confirmation of fix)
+- Bright orange `#eb6420`: workflow labels for core team members (attached PR, awaiting developer action/feedback)
+- Light blue `#82C5FF`: functional labels
+- Green labels `#009800`: issues that can generally be ignored. For example, issues given the following labels normally can be closed immediately:
+  - Feature request (see copy & paste response: [Feature requests](#feature-requests))
+  - Support (see copy & paste response: [Support requests and configuration questions](#support-requests-and-configuration-questions)
+
+## Common actions
+
+### Issue team
+- Looks for issues without workflow labels and triages issue
+- Monitors pull requests
+- Closes invalid issues and pull requests with a comment (duplicates, [feature requests](#feature-requests), [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
+- Assigns appropriate [labels](#how-we-handle-issues)
+- Asks for feedback from issue reporter/pull request initiator ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
+- Asks for feedback from the relevant developer(s) based on the [list of members and their specialities](http://gitlab.org/team/)
+- Monitors all issues/pull requests for feedback (but especially ones commented on since automatically watching them):
+- Assigns issues to developers if they indicate they are fixing it
+- Assigns pull requests to developers if they indicate they will take care of merge
+- Closes issues with no feedback from the reporter for two weeks
+- Closes stale pull requests
+
+### Development team
+
+- Responds to issues and pull requests the issue team mentions them in
+- Monitors for new issues in _Awaiting developer action/feedback_ with no developer activity (once a week)
+- Monitors for new pull requests (at least once a week)
+- Manages their work queue by looking at issues and pull requests assigned to them
+- Close fixed issues (via commit messages or manually)
+- Codes [new features](http://feedback.gitlab.com/forums/176466-general/filters/top)!
+- Response guidelines
+- Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (hearth, star, smile, etc.). Some good tips about giving feedback to pull requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
+
+## Copy & paste responses
+
+### Improperly formatted issue
+
+Thanks for the issue report. Please reformat your issue to conform to the issue tracker guidelines found in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+
+### Feature requests
+
+Thanks for your interest in GitLab. We don't use the GitHub issue tracker for feature requests. Please use http://feedback.gitlab.com/ for this purpose or create a pull request implementing this feature. Have a look at the \[contribution guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) for more information.
+
+### Issue report for old version
+
+Thanks for the issue report but we only support issues for the latest stable version of GitLab. I'm closing this issue but if you still experience this problem in the latest stable version, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+
+### Support requests and configuration questions
+
+Thanks for your interest in GitLab. We don't use the GitHub issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the unofficial #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) for more information.
+
+### Code format
+
+Please use ``` to format console output, logs, and code as it's very hard to read otherwise.
+
+### Issue fixed in newer version
+
+Thanks for the issue report. This issue has already been fixed in newer versions of GitLab. Due to the size of this project and our limited resources we are only able to support the latest stable release as outlined in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker). In order to get this bug fix and enjoy many new features please \[upgrade\]\(http://blog.gitlab.org/). If you still experience issues at that time please open a new issue following our issue tracker guidelines found in the \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+
+### Improperly formatted pull request
+
+Thanks for your interest in improving the GitLab codebase! Please update your pull request according to the \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#pull-request-guidelines).
+
+### Inactivity close of an issue
+
+It's been at least 2 weeks (and a new release) since we heard from you. I'm closing this issue but if you still experience this problem, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+
+### Inactivity close of a pull request
+
+This pull request has been closed because a request for more information has not been reacted to for more than 2 weeks. If you respond and conform to the pull request guidelines in our \[contributing guidelines\]\(https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md#pull-requests) we will reopen this pull request.
+

README.md

@@ -147,6 +147,8 @@ or start each component separately
 * [Mailing list](https://groups.google.com/forum/#!forum/gitlabhq) and [Stack Overflow](http://stackoverflow.com/questions/tagged/gitlab) are the best places to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and has resolved it. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix.
+* [Unofficial #gitlab IRC on Freenode](http://www.freenode.net/) is another way to get in touch with other GitLab users who may be able to help you.
+
 * [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab.
 * [Contributing guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) describes how to submit pull requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed.

app/assets/javascripts/behaviors/toggler_behavior.coffee

@@ -11,3 +11,7 @@ $ ->
     container = $(".js-toggle-visibility-container")
     container.toggleClass("hide")
     e.preventDefault()
+  
+  $("body").on "click", ".js-toggle-button", (e) ->
+    $(@).closest(".js-toggle-container").find(".js-toggle-content").toggle()
+    e.preventDefault()

app/assets/javascripts/branch-graph.js.coffee

@@ -62,22 +62,22 @@ class BranchGraph
     cuday = 0
     cumonth = ""
-    r.rect(0, 0, 26, @barHeight).attr fill: "#222"
-    r.rect(26, 0, 20, @barHeight).attr fill: "#444"
+    r.rect(0, 0, 40, @barHeight).attr fill: "#222"
+    r.rect(40, 0, 30, @barHeight).attr fill: "#444"
     for day, mm in @days
       if cuday isnt day[0]
         # Dates
-        r.text(36, @offsetY + @unitTime * mm, day[0])
+        r.text(55, @offsetY + @unitTime * mm, day[0])
           .attr(
             font: "12px Monaco, monospace"
-            fill: "#DDD"
+            fill: "#BBB"
           )
         cuday = day[0]
       if cumonth isnt day[1]
         # Months
-        r.text(13, @offsetY + @unitTime * mm, day[1])
+        r.text(20, @offsetY + @unitTime * mm, day[1])
           .attr(
             font: "12px Monaco, monospace"
             fill: "#EEE"

app/assets/javascripts/dispatcher.js.coffee

@@ -39,7 +39,9 @@ class Dispatcher
     switch path.first()
       when 'admin' then new Admin()
-      when 'wikis' then new Wikis()
+      when 'projects'
+        new Wikis() if path[1] == 'wikis'
+
   initSearch: ->
     autocomplete_json = $('.search-autocomplete-json').data('autocomplete-opts')

app/assets/javascripts/extensions/jquery.js.coffee

@@ -7,3 +7,7 @@ $.fn.enableButton = ->
   $(@).removeAttr('disabled').
     removeClass('disabled')
+$.fn.disableButton = ->
+  $(@).attr('disabled', 'disabled').
+    addClass('disabled')
+

app/assets/javascripts/gfm_auto_complete.js.coffee

@@ -44,7 +44,7 @@ GitLab.GfmAutoComplete =
       tpl: @Issues.template
       callbacks:
         before_save: (issues) ->
-          $.map issues, (i) -> id: i.id, title: i.title, search: "#{i.id} #{i.title}"
+          $.map issues, (i) -> id: i.id, title: sanitize(i.title), search: "#{i.id} #{i.title}"
     input.one "focus", =>
       $.getJSON(@dataSource).done (data) ->

app/assets/javascripts/main.js.coffee

@@ -119,7 +119,7 @@ $ ->
   # Commit show suppressed diff
-  $(".supp_diff_link").bind "click", ->
+  $(".content").on "click", ".supp_diff_link", ->
     $(@).next('table').show()
     $(@).remove()

app/assets/javascripts/merge_requests.js.coffee

@@ -22,12 +22,7 @@ class MergeRequest
     this.$('.show-all-commits').on 'click', =>
       this.showAllCommits()
     
-    modal = $('#modal_merge_info').modal modal: true, show:false
-
-    $('.how_to_merge_link').bind "click", ->
-      modal.show()
-    $('.modal-header .close').bind "click", ->
-      modal.hide()
+    modal = $('#modal_merge_info').modal(show: false)
   # Local jQuery finder
   $: (selector) ->

app/assets/javascripts/notes.js

@@ -227,10 +227,11 @@ var NoteList = {
     // Show the attachment delete link
     note.find(".js-note-attachment-delete").show();
+    GitLab.GfmAutoComplete.setup();
+
     var form = note.find(".note-edit-form");
     form.show();
-
     var textarea = form.find("textarea");
     var p = $("<p></p>").text(textarea.val());
     var hidden_div = $('<div class="note-original-content"></div>').append(p);

app/assets/javascripts/wikis.js.coffee

 class Wikis
   constructor: ->
-    modal = $('#modal-new-wiki').modal({modal: true, show:false})
-
-    $('.add-new-wiki').bind "click", ->
-      modal.show()
-
     $('.build-new-wiki').bind "click", ->
       field = $('#new_wiki_path')
       slug = field.val()
@@ -13,7 +8,5 @@ class Wikis
       if(slug.length > 0)
         location.href = path + "/" + slug
-    $('.modal-header .close').bind "click", ->
-      modal.hide()
 @Wikis = Wikis

app/assets/stylesheets/common.scss

@@ -81,33 +81,6 @@ span.update-author {
   font-weight: normal;
 }
-form {
-  @extend .form-horizontal;
-
-  .actions {
-    @extend .form-actions;
-  }
-
-  .clearfix {
-    @extend .control-group;
-  }
-
-  .input {
-    @extend .controls;
-  }
-
-  label {
-    @extend .control-label;
-  }
-  .xlarge {
-    @extend .input-xlarge;
-  }
-  .xxlarge {
-    @extend .input-xxlarge;
-  }
-}
-
-
 .field_with_errors {
   display: inline;
 }
@@ -121,15 +94,6 @@ ul.breadcrumb {
   }
   a {
-    color: #474D57;
-    font-weight: bold;
-    font-size: 14px;
-  }
-}
-
-input[type=text] {
-  &.large_text {
-    padding: 6px;
     font-size: 16px;
   }
 }

app/assets/stylesheets/gitlab_bootstrap.scss

@@ -2,11 +2,49 @@
 $baseFontSize: 13px !default;
 $baseLineHeight: 18px !default;
-// BOOTSTRAP
-@import "bootstrap";
+/**
+ * BOOTSTRAP
+ */
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+@import "bootstrap/reset";
+@import "bootstrap/scaffolding";
+@import "bootstrap/grid";
+@import "bootstrap/layouts";
+@import "bootstrap/type";
+@import "bootstrap/code";
+@import "bootstrap/forms";
+@import "bootstrap/tables";
+@import "bootstrap/sprites";
+@import "bootstrap/dropdowns";
+@import "bootstrap/wells";
+@import "bootstrap/component-animations";
+@import "bootstrap/close";
+@import "bootstrap/button-groups";
+@import "bootstrap/alerts";
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+@import "bootstrap/breadcrumbs";
+@import "bootstrap/pagination";
+@import "bootstrap/pager";
+@import "bootstrap/modals";
+@import "bootstrap/tooltip";
+@import "bootstrap/popovers";
+@import "bootstrap/thumbnails";
+@import "bootstrap/media";
+@import "bootstrap/labels-badges";
+@import "bootstrap/progress-bars";
+@import "bootstrap/accordion";
+@import "bootstrap/carousel";
+@import "bootstrap/hero-unit";
+@import "bootstrap/utilities";
 @import "bootstrap/responsive-utilities";
 @import "bootstrap/responsive-1200px-min";
+/**
+ * Font icons
+ *
+ */
 @import "font-awesome";
 /**
@@ -26,3 +64,4 @@ $baseLineHeight: 18px !default;
 @import "gitlab_bootstrap/files.scss";
 @import "gitlab_bootstrap/tables.scss";
 @import "gitlab_bootstrap/lists.scss";
+@import "gitlab_bootstrap/forms.scss";

app/assets/stylesheets/gitlab_bootstrap/blocks.scss

@@ -10,15 +10,34 @@
  *
  */
 .ui-box {
-  background: #F9F9F9;
+  background: #FFF;
   margin-bottom: 20px;
   border: 1px solid #CCC;
   word-wrap: break-word;
-  @include solid-shade;
+
+  &.small-box {
+    margin-bottom: 10px;
+
+    .title {
+      font-size: 13px;
+      line-height: 30px;
+
+      a {
+        color: #666;
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+  }
   &.ui-box-show {
     margin:20px 0;
     background: #FFF;
+
+    .control-group {
+      margin-bottom: 0;
+    }
   }
   &.ui-box-danger {
@@ -71,10 +90,6 @@
     border-top: 1px solid #eee;
   }
-  &.white {
-    background: #fff;
-  }
-
   ul {
     margin: 0;
   }
@@ -102,6 +117,8 @@
     .btn {
       vertical-align: middle;
+      padding: 4px 12px;
+      @include box-shadow(0 0px 1px 1px #f2f2f2);
     }
     .nav-pills {

app/assets/stylesheets/gitlab_bootstrap/buttons.scss

 .btn {
+  display: inline-block;
+  padding: 6px 12px;
+  margin-bottom: 0;
+  font-size: 13px;
+  line-height: $baseLineHeight;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  border: 1px solid #BBB;
+  color: $style_color;
+  @include border-radius($baseBorderRadius);
+  @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2));
   @include linear-gradient(#f1f1f1, #e1e1e1);
   text-shadow: 0 1px 1px #FFF;
-  border-color: #BBB;
+  text-decoration: none;
+  &.hover,
   &:hover {
+    color: $style_color;
     background: #f1f1f1;
-    @include linear-gradient(#fAfAfA, #f1f1f1);
     border-color: #AAA;
-    color: #333;
+    text-decoration: none;
+    @include linear-gradient(#fAfAfA, #f1f1f1);
   }
-  &.btn-primary {
-    background: #2a79A3;
-    @include linear-gradient(#47A7b7, #2585b5);
-    border-color: #2A79A3;
-    color: #fff;
-    text-shadow: 0 1px 1px #268;
-    &:hover {
-      background: $primary_color;
-      color: #fff;
-    }
-    &.disabled {
-      color: #fff;
-      background: $primary_color;
-    }
+  &.focus,
+  &:focus {
+    text-decoration: none;
+    @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
+  }
+  &.active,
+  &:active {
+    background-image: none;
+    outline: 0;
+    text-decoration: none;
+    @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
   }
-  &.btn-info {
-    background: #5aB9C3;
-    border-color: $primary_color;
-    color: #fff;
-    text-shadow: 0 1px 1px #268;
-    &:hover {
-      background: $primary_color;
-      color: #fff;
-    }
-    &.disabled {
-      color: #fff;
-      background: $primary_color;
+  &.disabled,
+  &[disabled] {
+    cursor: default;
+    background-image: none;
+    @include opacity(65);
+    @include box-shadow(none);
+  }
+  &.btn-primary {
+    color: #FFF;
+    border-color: #189;
+    text-shadow: 0 1px 1px #189;
+    @include linear-gradient(#4AC, #289);
+
+    &.hover,
+    &:hover,
+    &.disabled,
+    &[disabled] {
+      color: #FFF;
+      background: #389;
     }
   }
   &.btn-success {
-    &:hover {
-      background: #51a351;
+    color: #FFF;
+    border-color: #1A1;
+    text-shadow: 0 1px 1px #FFF;
+    text-shadow: 0 1px 1px #181;
+    @include linear-gradient(#62C452, #51a351);
+
+
+    &.hover,
+    &:hover,
+    &.disabled,
+    &[disabled] {
+      color: #FFF;
+      background: #2A2;
     }
-    &.disabled {
-      color: #fff;
-      background: #2b2;
+  }
+
+  &.btn-danger {
+    color: #FFF;
+    text-shadow: 0 1px 1px #811;
+    border-color: #BD362F;
+    @include linear-gradient(#EE5F5B, #BD362F);
+
+    &.hover,
+    &:hover,
+    &.disabled,
+    &[disabled] {
+      color: #FFF;
+      background: #A22;
     }
   }
+  &.btn-new {
+    @extend .btn-success;
+  }
+
   &.btn-create {
     @extend .wide;
     @extend .btn-success;
@@ -67,12 +111,6 @@
   &.btn-close,
   &.btn-remove {
     @extend .btn-danger;
-    border-color: #BD362F;
-
-    &:hover {
-      color: #fff;
-      background: #EE4E49;
-    }
   }
   &.btn-cancel {
@@ -84,13 +122,9 @@
     padding-right: 20px;
   }
-  &.small {
-    @extend .btn-small;
-  }
-
-  &.active {
-    border-color: #aaa;
-    background-color: #ccc;
+  &.btn-small {
+    padding: 2px 10px;
+    font-size: 12px;
   }
   &.btn-tiny {
@@ -104,9 +138,4 @@
     margin-right: 7px;
     float: left;
   }
-
-  &.padded {
-    margin-right: 3px;
-    padding: 4px 10px 4px;
-  }
 }

app/assets/stylesheets/gitlab_bootstrap/common.scss

@@ -48,7 +48,13 @@
   line-height: 36px;
 }
-p.slead { color: #456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
+.slead {
+  color: #666;
+  font-size: 14px;
+  margin-bottom: 12px;
+  font-weight: normal;
+  line-height: 24px;
+}
 /** FORMS **/
 input[type='search'].search-text-input {
@@ -66,7 +72,7 @@ input[type='text'].danger {
   text-shadow: 0 1px 1px #fff
 }
-fieldset legend { font-size: 17px; }
+fieldset legend { font-size: 15px; }
 .tab-content {
   overflow: visible;
@@ -90,3 +96,11 @@ pre.well-pre {
   border-radius: 0;
   color: #555;
 }
+
+.input-append .btn.active, .input-prepend .btn.active {
+  background: #CCC;
+  border-color: #BBB;
+  text-shadow: 0 1px 1px #fff;
+  font-weight: bold;
+  @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
+}