Merge branch 'merge_ce' into 'master'
Merge CE into EE See merge request !302
Showing
... | @@ -119,8 +119,8 @@ gem "acts-as-taggable-on" | ... | @@ -119,8 +119,8 @@ gem "acts-as-taggable-on" |
# Background jobs | # Background jobs | ||
gem 'slim' | gem 'slim' | ||
gem 'sinatra', require: nil | gem 'sinatra', require: nil | ||
gem 'sidekiq', '2.17.8' | gem 'sidetiq', '0.6.3' | ||
gem 'sidetiq', '0.6.1' | gem 'sidekiq', '~> 3.3' | ||
# HTTP requests | # HTTP requests | ||
gem "httparty" | gem "httparty" | ||
... | @@ -156,6 +156,9 @@ gem "slack-notifier", "~> 1.0.0" | ... | @@ -156,6 +156,9 @@ gem "slack-notifier", "~> 1.0.0" |
# d3 | # d3 | ||
gem "d3_rails", "~> 3.1.4" | gem "d3_rails", "~> 3.1.4" | ||
#cal-heatmap | |||
gem "cal-heatmap-rails", "~> 0.0.1" | |||
# underscore-rails | # underscore-rails | ||
gem "underscore-rails", "~> 1.4.4" | gem "underscore-rails", "~> 1.4.4" | ||
... | @@ -172,7 +175,7 @@ gem 'ace-rails-ap' | ... | @@ -172,7 +175,7 @@ gem 'ace-rails-ap' |
gem 'mousetrap-rails' | gem 'mousetrap-rails' | ||
# Semantic UI Sass for Sidebar | # Semantic UI Sass for Sidebar | ||
gem 'semantic-ui-sass', '~> 0.16.1.0' | gem 'semantic-ui-sass', '~> 1.8.0' | ||
gem "sass-rails", '~> 4.0.2' | gem "sass-rails", '~> 4.0.2' | ||
gem "coffee-rails" | gem "coffee-rails" | ||
... | ... |
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.