summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-10 07:44:30 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-10 07:44:30 +0000
commit468c355910195dd243e8e40d6b62d41346b65d29 (patch)
tree6ab1d3be5dd4ce3e358bcc06e6c863efad455169
parent766688d0fd714ab2b42cc8e5bce2675991c73478 (diff)
parent6f79b5336fb9ac011dd19d5720b8bfda8b6fa53a (diff)
downloadgitlab-ce-468c355910195dd243e8e40d6b62d41346b65d29.tar.gz
Merge branch 'rs-update-whenever' into 'master'
Remove whenever gem Closes #2879 See merge request !1538
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock5
2 files changed, 0 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index 044dc30ecd4..b3e05407c9c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -300,9 +300,6 @@ gem 'activerecord-deprecated_finders', '~> 1.0.3'
gem 'activerecord-session_store', '~> 0.1.0'
gem "nested_form", '~> 0.3.2'
-# Scheduled
-gem 'whenever', '~> 0.8.4', require: false
-
# OAuth
gem 'oauth2', '~> 1.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index f716c0254ec..ef91604d8be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,6 @@ GEM
celluloid (0.16.0)
timers (~> 4.0.0)
charlock_holmes (0.6.9.4)
- chronic (0.10.2)
chunky_png (1.3.4)
cliver (0.3.2)
coderay (1.1.0)
@@ -776,9 +775,6 @@ GEM
websocket-driver (0.6.2)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
- whenever (0.8.4)
- activesupport (>= 2.3.4)
- chronic (>= 0.6.3)
wikicloth (0.8.1)
builder
expression_parser
@@ -943,7 +939,6 @@ DEPENDENCIES
version_sorter (~> 2.0.0)
virtus (~> 1.0.1)
webmock (~> 1.21.0)
- whenever (~> 0.8.4)
wikicloth (= 0.8.1)
BUNDLED WITH