Add instructions for backups using cron

[wvm/gitlab.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 4913eaf..2c821a9 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,9 @@
 GIT
-  remote: https://github.com/gitlabhq/gon.git
-  revision: 58ca8e17273051cb370182cabd3602d1da6783ab
-  ref: 58ca8e17273051cb370182cabd3602d1da6783ab
+  remote: https://github.com/gitlabhq/markup.git
+  revision: 61ade389c1e1c159359338f570d18464a44ddbc4
+  ref: 61ade389c1e1c159359338f570d18464a44ddbc4
   specs:
-    gon (4.1.1)
-      actionpack (>= 2.3.0)
-      json
+    github-markup (0.7.6)
 
 GEM
   remote: https://rubygems.org/
@@ -51,14 +49,13 @@ GEM
     axiom-types (0.0.5)
       descendants_tracker (~> 0.0.1)
       ice_nine (~> 0.9)
-    backports (3.3.5)
     bcrypt-ruby (3.1.2)
     better_errors (1.0.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (2.3.2.2)
+    bootstrap-sass (3.0.3.0)
       sass (~> 3.2)
     builder (3.1.4)
     capybara (2.1.0)
@@ -74,18 +71,11 @@ GEM
     celluloid (0.15.2)
       timers (~> 1.1.0)
     charlock_holmes (0.6.9.4)
-    chosen-rails (1.0.1)
-      coffee-rails (>= 3.2)
-      compass-rails (>= 1.0)
-      railties (>= 3.0)
-      sass-rails (>= 3.2)
-    chunky_png (1.2.9)
     cliver (0.2.2)
     code_analyzer (0.4.3)
       sexp_processor
     coderay (1.1.0)
-    coercible (0.2.0)
-      backports (~> 3.0, >= 3.1.0)
+    coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -96,12 +86,6 @@ GEM
     coffee-script-source (1.6.3)
     colored (1.2)
     colorize (0.5.8)
-    compass (0.12.2)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    compass-rails (1.1.1)
-      compass (>= 0.12.2)
     connection_pool (1.2.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
@@ -130,6 +114,8 @@ GEM
     email_spec (1.5.0)
       launchy (~> 2.1)
       mail (~> 2.2)
+    email_validator (1.4.0)
+      activemodel
     enumerize (0.7.0)
       activesupport (>= 3.2)
     equalizer (0.0.8)
@@ -165,12 +151,10 @@ GEM
       dotenv (>= 0.7)
       thor (>= 0.13.6)
     formatador (0.2.4)
-    fssm (0.2.10)
     gemoji (1.3.1)
     gherkin-ruby (0.3.1)
       racc
     github-markdown (0.5.5)
-    github-markup (0.7.5)
     gitlab-flowdock-git-hook (0.4.2.2)
       gitlab-grit (>= 2.4.1)
       multi_json
@@ -197,7 +181,7 @@ GEM
     gitlab-pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    gitlab_git (4.0.0.pre)
+    gitlab_git (4.0.0)
       activesupport (~> 4.0.0)
       gitlab-grit (~> 2.6.1)
       gitlab-linguist (~> 2.9.5)
@@ -208,6 +192,9 @@ GEM
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
+    gon (5.0.1)
+      actionpack (>= 2.3.0)
+      json
     grape (0.6.1)
       activesupport
       builder
@@ -243,7 +230,7 @@ GEM
       railties (~> 4.0.0)
     hashie (2.0.5)
     hike (1.2.3)
-    hipchat (0.9.0)
+    hipchat (0.14.0)
       httparty
       httparty
     http_parser.rb (0.5.3)
@@ -259,7 +246,7 @@ GEM
       rack (>= 1.2.1)
       rake
     jasmine-core (2.0.0.rc5)
-    jquery-atwho-rails (0.4.1)
+    jquery-atwho-rails (0.3.3)
     jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
@@ -272,7 +259,7 @@ GEM
     json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    kaminari (0.14.1)
+    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.8.1)
@@ -294,7 +281,7 @@ GEM
     minitest (4.7.5)
     modernizr (2.6.2)
       sprockets (~> 2.0)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
@@ -541,9 +528,11 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    virtus (1.0.0)
+    unicorn-worker-killer (0.4.2)
+      unicorn (~> 4)
+    virtus (1.0.1)
       axiom-types (~> 0.0.5)
-      coercible (~> 0.2)
+      coercible (~> 1.0)
       descendants_tracker (~> 0.0.1)
       equalizer (~> 0.0.7)
     warden (1.2.3)
@@ -562,17 +551,15 @@ PLATFORMS
 DEPENDENCIES
   actionpack-action_caching
   actionpack-page_caching
-  activerecord-deprecated_finders
   acts-as-taggable-on
   annotate (~> 2.6.0.beta2)
   asciidoctor
   awesome_print
   better_errors
   binding_of_caller
-  bootstrap-sass (~> 2.3)
+  bootstrap-sass (~> 3.0)
   capybara
   carrierwave
-  chosen-rails (= 1.0.1)
   coffee-rails
   colored
   coveralls
@@ -581,6 +568,7 @@ DEPENDENCIES
   devise (= 3.0.4)
   devise-async (= 0.8.0)
   email_spec
+  email_validator (~> 1.4.0)
   enumerize
   factory_girl_rails
   ffaker
@@ -588,30 +576,30 @@ DEPENDENCIES
   font-awesome-rails (~> 3.2)
   foreman
   gemoji (~> 1.3.0)
-  github-markup (~> 0.7.4)
+  github-markup (~> 0.7.4)!
   gitlab-flowdock-git-hook (~> 0.4.2)
   gitlab-gollum-lib (~> 1.0.2)
   gitlab-grack (~> 2.0.0.pre)
   gitlab-linguist (~> 2.9.6)
   gitlab-pygments.rb (~> 0.5.4)
-  gitlab_git (~> 4.0.0.pre)
+  gitlab_git (~> 4.0.0)
   gitlab_meta (= 6.0)
   gitlab_omniauth-ldap (= 1.0.3)
-  gon!
+  gon (~> 5.0.0)
   grape (~> 0.6.1)
   grape-entity (~> 0.3.0)
   growl
   guard-rspec
   guard-spinach
   haml-rails
-  hipchat (~> 0.9.0)
+  hipchat (~> 0.14.0)
   httparty
   jasmine (= 2.0.0.rc5)
-  jquery-atwho-rails (~> 0.4.1)
+  jquery-atwho-rails (~> 0.3.3)
   jquery-rails (= 2.1.3)
   jquery-turbolinks
   jquery-ui-rails (= 2.0.2)
-  kaminari (~> 0.14.1)
+  kaminari (~> 0.15.1)
   launchy
   letter_opener
   minitest (~> 4.7.0)
@@ -662,4 +650,5 @@ DEPENDENCIES
   uglifier
   underscore-rails (~> 1.4.4)
   unicorn (~> 4.6.3)
+  unicorn-worker-killer
   webmock