Permalink
Switch branches/tags
Nothing to show
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
542 lines (540 sloc) 12.8 KB
diff --git a/Gemfile.lock b/Gemfile.lock
index 37a2299..14a3876 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,3 @@
-GIT
- remote: https://github.com/ctran/annotate_models.git
- revision: 18a4e2eb77c8f3ef695b563e4a7ca45dfede819b
- specs:
- annotate (2.6.0.beta2)
- activerecord (>= 2.3.0)
- rake (>= 0.8.7)
-
-GIT
- remote: https://github.com/gitlabhq/raphael-rails.git
- revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
- specs:
- raphael-rails (2.1.0)
-
GEM
remote: https://rubygems.org/
specs:
@@ -21,16 +7,16 @@ GEM
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
- builder (~> 3.0.0)
+ builder (>= 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.2.1)
+ sprockets (>= 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
- builder (~> 3.0.0)
+ builder (>= 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
@@ -45,26 +31,29 @@ GEM
acts-as-taggable-on (2.4.1)
rails (>= 3, < 5)
addressable (2.3.4)
+ annotate (2.6.0.beta2)
+ activerecord (>= 2.3.0)
+ rake (>= 0.8.7)
arel (3.0.2)
asciidoctor (0.1.3)
awesome_print (1.1.0)
- backports (3.3.2)
- bcrypt-ruby (3.1.1)
+ backports (3.3.3)
+ bcrypt-ruby (3.0.1)
better_errors (0.9.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootstrap-sass (2.3.2.0)
+ bootstrap-sass (2.3.2.2)
sass (~> 3.2)
- builder (3.0.4)
+ builder (3.1.4)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- carrierwave (0.8.0)
+ carrierwave (0.9.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
celluloid (0.14.1)
@@ -77,7 +66,7 @@ GEM
compass-rails (>= 1.0)
railties (>= 3.0)
sass-rails (>= 3.2)
- chunky_png (1.2.8)
+ chunky_png (1.2.7)
code_analyzer (0.3.2)
sexp_processor
coderay (1.0.9)
@@ -87,7 +76,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.6.2)
+ coffee-script-source (1.6.1)
colored (1.2)
colorize (0.5.8)
compass (0.12.2)
@@ -105,7 +94,7 @@ GEM
thor
crack (0.4.0)
safe_yaml (~> 0.9.0)
- d3_rails (3.1.10)
+ d3_rails (3.3.2)
railties (>= 3.1.0)
daemons (1.1.9)
database_cleaner (1.0.1)
@@ -116,7 +105,7 @@ GEM
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
- diff-lcs (1.2.4)
+ diff-lcs (1.1.3)
dotenv (0.8.0)
email_spec (1.4.0)
launchy (~> 2.1)
@@ -134,10 +123,8 @@ GEM
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
- faraday (0.8.7)
+ faraday (0.8.8)
multipart-post (~> 1.1)
- faraday_middleware (0.9.0)
- faraday (>= 0.7.4, < 0.9)
faye-websocket (0.4.7)
eventmachine (>= 0.12.0)
ffaker (1.16.1)
@@ -158,7 +145,7 @@ GEM
dotenv (>= 0.7)
thor (>= 0.13.6)
formatador (0.2.4)
- fssm (0.2.10)
+ fssm (0.2.7)
gemoji (1.2.1)
gherkin-ruby (0.3.0)
github-linguist (2.3.4)
@@ -173,9 +160,9 @@ GEM
github-markup (>= 0.7.5, < 1.0.0)
gitlab-grit (>= 2.5.1)
nokogiri (~> 1.5.9)
- pygments.rb (~> 0.4.2)
- sanitize (~> 2.0.3)
- stringex (~> 1.5.1)
+ pygments.rb (~> 0.5.2)
+ sanitize (~> 2.0.6)
+ stringex (~> 2.0.5)
gitlab-grack (1.0.1)
rack (~> 1.4.1)
gitlab-grit (2.6.0)
@@ -186,11 +173,10 @@ GEM
gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
- gitlab_git (2.0.1)
+ gitlab_git (2.1.1)
activesupport (~> 3.2.13)
github-linguist (~> 2.3.4)
gitlab-grit (~> 2.6.0)
- gitlab_meta (6.0)
gitlab_omniauth-ldap (1.0.3)
net-ldap (~> 0.3.1)
omniauth (~> 1.0)
@@ -199,7 +185,7 @@ GEM
gon (4.1.1)
actionpack (>= 2.3.0)
json
- grape (0.4.1)
+ grape (0.5.0)
activesupport
builder
hashie (>= 1.2.0)
@@ -232,13 +218,13 @@ GEM
activesupport (>= 3.1, < 4.1)
haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1)
- hashie (1.2.0)
- hike (1.2.3)
- hipchat (0.9.0)
+ hashie (2.0.5)
+ hike (1.2.1)
+ hipchat (0.11.0)
httparty
httparty
http_parser.rb (0.5.3)
- httparty (0.11.0)
+ httparty (0.10.2)
multi_json (~> 1.0)
multi_xml (>= 0.5.2)
httpauth (0.2.0)
@@ -250,11 +236,11 @@ GEM
selenium-webdriver (>= 0.1.3)
jasmine-core (1.3.1)
journey (1.0.4)
- jquery-atwho-rails (0.3.0)
- jquery-rails (2.1.3)
+ jquery-atwho-rails (0.3.1)
+ jquery-rails (3.0.4)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
- jquery-turbolinks (1.0.0)
+ jquery-turbolinks (2.0.1)
railties (>= 3.1.0)
turbolinks
jquery-ui-rails (2.0.2)
@@ -271,43 +257,42 @@ GEM
addressable (~> 2.3)
letter_opener (1.1.1)
launchy (~> 2.2)
- libv8 (3.11.8.17)
listen (1.2.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
lumberjack (1.0.3)
- mail (2.5.4)
+ mail (2.5.3)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
- mime-types (1.23)
+ mime-types (1.19)
minitest (4.7.4)
modernizr (2.6.2)
sprockets (~> 2.0)
- multi_json (1.7.9)
- multi_xml (0.5.4)
+ multi_json (1.7.7)
+ multi_xml (0.5.2)
multipart-post (1.2.0)
- mysql2 (0.3.11)
+ mysql2 (0.3.13)
net-ldap (0.3.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.6.8)
- nokogiri (1.5.10)
+ nokogiri (1.5.9)
oauth (0.4.7)
oauth2 (0.8.1)
faraday (~> 0.8)
- httpauth (~> 0.1)
+ httpauth (~> 0.2)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
omniauth (1.1.4)
hashie (>= 1.2, < 3)
rack
- omniauth-github (1.1.0)
+ omniauth-github (1.1.1)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
- omniauth-google-oauth2 (0.1.19)
+ omniauth-google-oauth2 (0.2.0)
omniauth (~> 1.0)
omniauth-oauth2
omniauth-oauth (1.0.1)
@@ -316,11 +301,11 @@ GEM
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
- omniauth-twitter (0.0.17)
+ omniauth-twitter (1.0.0)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
orm_adapter (0.4.0)
- pg (0.15.1)
+ pg (0.14.1)
poltergeist (1.3.0)
capybara (~> 2.1.0)
faye-websocket (>= 0.4.4, < 0.5.0)
@@ -331,16 +316,14 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
- puma (2.3.1)
- rack (>= 1.1, < 2.0)
- pygments.rb (0.4.2)
+ pygments.rb (0.5.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
rack (1.4.5)
- rack-accept (0.4.5)
+ rack-accept (0.4.3)
rack (>= 0.4)
rack-cache (1.2)
rack (>= 0.4)
@@ -350,7 +333,7 @@ GEM
rack (>= 1.0.0)
rack-protection (1.5.0)
rack
- rack-ssl (1.3.3)
+ rack-ssl (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
@@ -378,18 +361,19 @@ GEM
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
- rdoc (~> 3.4)
+ rdoc (>= 3.4)
thor (>= 0.14.6, < 2.0)
- raindrops (0.11.0)
- rake (10.1.0)
+ raindrops (0.10.0)
+ rake (10.0.4)
+ raphael-rails (2.1.1)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
ffi (>= 0.5.0)
- rdoc (3.12.2)
+ rdoc (4.0.1)
json (~> 1.4)
- redcarpet (2.2.2)
+ redcarpet (2.1.1)
redis (3.0.4)
redis-actionpack (3.2.3)
actionpack (~> 3.2.3)
@@ -398,7 +382,7 @@ GEM
redis-activesupport (3.2.3)
activesupport (~> 3.2.3)
redis-store (~> 1.1.0)
- redis-namespace (1.3.0)
+ redis-namespace (1.3.1)
redis (~> 3.0.0)
redis-rack (1.4.2)
rack (~> 1.4.1)
@@ -409,7 +393,7 @@ GEM
redis-store (~> 1.1.0)
redis-store (1.1.3)
redis (>= 2.2.0)
- ref (1.0.5)
+ ref (1.0.0)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.13.0)
@@ -432,20 +416,20 @@ GEM
rubyntlm (0.1.1)
rubyzip (0.9.9)
safe_yaml (0.9.3)
- sanitize (2.0.3)
+ sanitize (2.0.6)
nokogiri (>= 1.4.4, < 1.6)
- sass (3.2.9)
+ sass (3.2.6)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sdoc (0.3.20)
json (>= 1.1.3)
- rdoc (~> 3.10)
+ rdoc (>= 3.10)
seed-fu (2.2.0)
activerecord (~> 3.1)
activesupport (~> 3.1)
- select2-rails (3.4.2)
+ select2-rails (3.4.7)
sass-rails
thor (~> 0.14)
selenium-webdriver (2.33.0)
@@ -457,13 +441,12 @@ GEM
sexp_processor (4.2.1)
shoulda-matchers (2.1.0)
activesupport (>= 3.0.0)
- sidekiq (2.12.4)
+ sidekiq (2.13.1)
celluloid (>= 0.14.1)
connection_pool (>= 1.0.0)
json
redis (>= 3.0)
redis-namespace
- simple_oauth (0.1.9)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
@@ -473,8 +456,8 @@ GEM
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
six (0.2.0)
- slim (2.0.0)
- temple (~> 0.6.5)
+ slim (1.3.8)
+ temple (~> 0.6.3)
tilt (~> 1.3, >= 1.3.3)
slop (3.4.5)
spinach (0.8.3)
@@ -485,49 +468,35 @@ GEM
railties (>= 3)
spinach (>= 0.4)
spork (1.0.0rc2)
- sprockets (2.2.2)
+ sprockets (2.8.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
stamp (0.5.0)
- state_machine (1.2.0)
- stringex (1.5.1)
- temple (0.6.5)
+ state_machine (1.1.2)
+ stringex (2.0.8)
+ temple (0.6.3)
test_after_commit (0.2.0)
- therubyracer (0.11.4)
- libv8 (~> 3.11.8.12)
+ therubyracer (0.11.0)
ref
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.18.1)
- tilt (1.4.1)
+ thor (0.17.0)
+ tilt (1.3.7)
timers (1.1.0)
- tinder (1.9.2)
- eventmachine (~> 1.0)
- faraday (~> 0.8)
- faraday_middleware (~> 0.9)
- hashie (~> 1.0)
- json (~> 1.7.5)
- mime-types (~> 1.19)
- multi_json (~> 1.5)
- twitter-stream (~> 0.1)
- treetop (1.4.14)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- turbolinks (1.2.0)
+ turbolinks (1.3.0)
coffee-rails
- twitter-stream (0.1.16)
- eventmachine (>= 0.12.8)
- http_parser.rb (~> 0.5.1)
- simple_oauth (~> 0.1.4)
- tzinfo (0.3.37)
- uglifier (2.1.1)
+ tzinfo (0.3.35)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
- underscore-rails (1.4.4)
+ underscore-rails (1.5.1)
unicorn (4.6.3)
kgio (~> 2.6)
rack
@@ -535,7 +504,7 @@ GEM
virtus (0.5.5)
backports (~> 3.3)
descendants_tracker (~> 0.0.1)
- warden (1.2.3)
+ warden (1.2.1)
rack (>= 1.0)
webmock (1.11.0)
addressable (>= 2.2.7)
@@ -550,7 +519,7 @@ PLATFORMS
DEPENDENCIES
acts-as-taggable-on
- annotate!
+ annotate
asciidoctor
awesome_print
better_errors
@@ -562,7 +531,7 @@ DEPENDENCIES
coffee-rails
colored
coveralls
- d3_rails (~> 3.1.4)
+ d3_rails (>= 3.1.4)
database_cleaner
devise (~> 2.2)
email_spec
@@ -578,21 +547,20 @@ DEPENDENCIES
gitlab-gollum-lib (~> 1.0.1)
gitlab-grack (~> 1.0.1)
gitlab-pygments.rb (~> 0.3.2)
- gitlab_git (= 2.0.1)
- gitlab_meta (= 6.0)
+ gitlab_git (= 2.1.1)
gitlab_omniauth-ldap (= 1.0.3)
gon
- grape (~> 0.4.1)
+ grape (~> 0.5.0)
grape-entity (~> 0.3.0)
growl
guard-rspec
guard-spinach
haml-rails
- hipchat (~> 0.9.0)
- httparty
+ hipchat (~> 0.11.0)
+ httparty (= 0.10.2)
jasmine
- jquery-atwho-rails (= 0.3.0)
- jquery-rails (= 2.1.3)
+ jquery-atwho-rails (= 0.3.1)
+ jquery-rails (= 3.0.4)
jquery-turbolinks
jquery-ui-rails (= 2.0.2)
kaminari (~> 0.14.1)
@@ -608,16 +576,15 @@ DEPENDENCIES
pg
poltergeist (~> 1.3.0)
pry
- puma (~> 2.3.1)
quiet_assets (~> 1.0.1)
rack-mini-profiler
rails (= 3.2.13)
rails-dev-tweaks
rails_best_practices
- raphael-rails!
+ raphael-rails
rb-fsevent
rb-inotify
- redcarpet (~> 2.2.2)
+ redcarpet (~> 2.1.1)
redis-rails
rspec-rails
sanitize
@@ -637,11 +604,10 @@ DEPENDENCIES
stamp
state_machine
test_after_commit
- therubyracer
+ therubyracer (= 0.11.0)
thin
- tinder (~> 1.9.2)
turbolinks
uglifier
- underscore-rails (~> 1.4.4)
+ underscore-rails (~> 1.5.1)
unicorn (~> 4.6.3)
webmock