diff options
author | Robert Speicher <robert@gitlab.com> | 2016-04-24 19:57:56 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-04-24 19:57:56 +0000 |
commit | 954af77b39b89555ba79063341010a10617e9e5b (patch) | |
tree | a77840d9fdaa801711c905ad43f1003c20776e75 | |
parent | 1cfd41591b639fe232aff04f4d66438fe3c88325 (diff) | |
parent | 2dd4f796b19e33af8eafd06fdab84c027cff70aa (diff) | |
download | gitlab-ce-954af77b39b89555ba79063341010a10617e9e5b.tar.gz |
Merge branch 'feature/snumb130/hide-future-blocks-on-graph' into 'master'
Hiding future dates on contribution calendar
Fixes #9036
See merge request !2628
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/calendar.scss | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index da83eab2de6..062a8cc4553 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.8.0 (unreleased) + - Remove future dates from contribution calendar graph. v 8.7.1 (unreleased) - Use the `can?` helper instead of `current_user.can?` @@ -178,7 +178,7 @@ gem 'ruby-fogbugz', '~> 0.2.1' gem 'd3_rails', '~> 3.5.0' #cal-heatmap -gem 'cal-heatmap-rails', '~> 3.5.0' +gem 'cal-heatmap-rails', '~> 3.6.0' # underscore-rails gem "underscore-rails", "~> 1.8.0" diff --git a/Gemfile.lock b/Gemfile.lock index e1c07a9ccb0..add056b169f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,7 +103,7 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (8.2.1) - cal-heatmap-rails (3.5.1) + cal-heatmap-rails (3.6.0) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -904,7 +904,7 @@ DEPENDENCIES bullet bundler-audit byebug - cal-heatmap-rails (~> 3.5.0) + cal-heatmap-rails (~> 3.6.0) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) carrierwave (~> 0.10.0) diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss index 0b3af592d4a..11f39d583bd 100644 --- a/app/assets/stylesheets/framework/calendar.scss +++ b/app/assets/stylesheets/framework/calendar.scss @@ -54,6 +54,10 @@ fill: #254e77 !important; } + .future { + visibility: hidden; + } + .domain-background { fill: none; shape-rendering: crispedges; |