245deb5cce
This commit fixes the regression caused by using a newer version of Grape and Grape entity. This solves Issue 4023.
589 lines
13 KiB
Text
589 lines
13 KiB
Text
GIT
|
|
remote: https://github.com/ctran/annotate_models.git
|
|
revision: 8bd159c7a484093fde84beaa9e6398f25ddacf09
|
|
specs:
|
|
annotate (2.6.0.beta1)
|
|
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:
|
|
actionmailer (3.2.13)
|
|
actionpack (= 3.2.13)
|
|
mail (~> 2.5.3)
|
|
actionpack (3.2.13)
|
|
activemodel (= 3.2.13)
|
|
activesupport (= 3.2.13)
|
|
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)
|
|
activemodel (3.2.13)
|
|
activesupport (= 3.2.13)
|
|
builder (~> 3.0.0)
|
|
activerecord (3.2.13)
|
|
activemodel (= 3.2.13)
|
|
activesupport (= 3.2.13)
|
|
arel (~> 3.0.2)
|
|
tzinfo (~> 0.3.29)
|
|
activeresource (3.2.13)
|
|
activemodel (= 3.2.13)
|
|
activesupport (= 3.2.13)
|
|
activesupport (3.2.13)
|
|
i18n (= 0.6.1)
|
|
multi_json (~> 1.0)
|
|
acts-as-taggable-on (2.4.0)
|
|
rails (~> 3.0)
|
|
addressable (2.3.4)
|
|
arel (3.0.2)
|
|
awesome_print (1.1.0)
|
|
backports (2.6.7)
|
|
bcrypt-ruby (3.0.1)
|
|
better_errors (0.8.0)
|
|
coderay (>= 1.0.0)
|
|
erubis (>= 2.6.6)
|
|
binding_of_caller (0.7.1)
|
|
debug_inspector (>= 0.0.1)
|
|
bootstrap-sass (2.3.1.0)
|
|
sass (~> 3.2)
|
|
builder (3.0.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)
|
|
activemodel (>= 3.2.0)
|
|
activesupport (>= 3.2.0)
|
|
celluloid (0.14.0)
|
|
timers (>= 1.0.0)
|
|
charlock_holmes (0.6.9.4)
|
|
chosen-rails (0.9.8)
|
|
railties (~> 3.0)
|
|
thor (~> 0.14)
|
|
code_analyzer (0.3.1)
|
|
sexp_processor
|
|
coderay (1.0.9)
|
|
coffee-rails (3.2.2)
|
|
coffee-script (>= 2.2.0)
|
|
railties (~> 3.2.0)
|
|
coffee-script (2.2.0)
|
|
coffee-script-source
|
|
execjs
|
|
coffee-script-source (1.6.2)
|
|
colored (1.2)
|
|
colorize (0.5.8)
|
|
connection_pool (1.0.0)
|
|
coveralls (0.6.7)
|
|
colorize
|
|
multi_json (~> 1.3)
|
|
rest-client
|
|
simplecov (>= 0.7)
|
|
thor
|
|
crack (0.3.2)
|
|
daemons (1.1.9)
|
|
database_cleaner (1.0.1)
|
|
debug_inspector (0.0.2)
|
|
descendants_tracker (0.0.1)
|
|
devise (2.2.4)
|
|
bcrypt-ruby (~> 3.0)
|
|
orm_adapter (~> 0.1)
|
|
railties (~> 3.1)
|
|
warden (~> 1.2.1)
|
|
diff-lcs (1.2.4)
|
|
dotenv (0.7.0)
|
|
email_spec (1.4.0)
|
|
launchy (~> 2.1)
|
|
mail (~> 2.2)
|
|
enumerize (0.5.1)
|
|
activesupport (>= 3.2)
|
|
erubis (2.7.0)
|
|
escape_utils (0.2.4)
|
|
eventmachine (1.0.3)
|
|
execjs (1.4.0)
|
|
multi_json (~> 1.0)
|
|
factory_girl (4.2.0)
|
|
activesupport (>= 3.0.0)
|
|
factory_girl_rails (4.2.1)
|
|
factory_girl (~> 4.2.0)
|
|
railties (>= 3.0.0)
|
|
faraday (0.8.7)
|
|
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.0)
|
|
ffi (1.8.1)
|
|
font-awesome-sass-rails (3.0.2.2)
|
|
railties (>= 3.1.1)
|
|
sass-rails (>= 3.1.1)
|
|
foreman (0.63.0)
|
|
dotenv (>= 0.7)
|
|
thor (>= 0.13.6)
|
|
formatador (0.2.4)
|
|
gemoji (1.2.1)
|
|
gherkin-ruby (0.3.0)
|
|
github-linguist (2.3.4)
|
|
charlock_holmes (~> 0.6.6)
|
|
escape_utils (~> 0.2.3)
|
|
mime-types (~> 1.19)
|
|
pygments.rb (>= 0.2.13)
|
|
github-markdown (0.5.3)
|
|
github-markup (0.7.5)
|
|
gitlab-gollum-lib (1.0.0)
|
|
github-markdown (~> 0.5.3)
|
|
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)
|
|
gitlab-grack (1.0.0)
|
|
rack (~> 1.4.1)
|
|
gitlab-grit (2.5.1)
|
|
charlock_holmes (~> 0.6.9)
|
|
diff-lcs (~> 1.1)
|
|
mime-types (~> 1.15)
|
|
posix-spawn (~> 0.3.6)
|
|
gitlab-pygments.rb (0.3.2)
|
|
posix-spawn (~> 0.3.6)
|
|
yajl-ruby (~> 1.1.0)
|
|
gitlab_git (1.2.1)
|
|
activesupport (~> 3.2.13)
|
|
github-linguist (~> 2.3.4)
|
|
gitlab-grit (~> 2.5.1)
|
|
gitlab_meta (5.0)
|
|
gitlab_omniauth-ldap (1.0.2)
|
|
net-ldap (~> 0.2.2)
|
|
omniauth (~> 1.0)
|
|
pyu-ruby-sasl (~> 0.0.3.1)
|
|
rubyntlm (~> 0.1.1)
|
|
gon (4.1.0)
|
|
actionpack (>= 2.3.0)
|
|
json
|
|
grape (0.3.1)
|
|
activesupport
|
|
builder
|
|
hashie (>= 1.2.0)
|
|
multi_json (>= 1.3.2)
|
|
multi_xml (>= 0.5.2)
|
|
rack (>= 1.3.0)
|
|
rack-accept
|
|
rack-mount
|
|
virtus
|
|
grape-entity (0.2.0)
|
|
activesupport
|
|
multi_json (>= 1.3.2)
|
|
growl (1.0.3)
|
|
guard (1.8.0)
|
|
formatador (>= 0.2.4)
|
|
listen (>= 1.0.0)
|
|
lumberjack (>= 1.0.2)
|
|
pry (>= 0.9.10)
|
|
thor (>= 0.14.6)
|
|
guard-rspec (3.0.0)
|
|
guard (>= 1.8)
|
|
rspec (~> 2.13)
|
|
guard-spinach (0.0.2)
|
|
guard (>= 1.1)
|
|
spinach
|
|
haml (4.0.2)
|
|
tilt
|
|
haml-rails (0.4)
|
|
actionpack (>= 3.1, < 4.1)
|
|
activesupport (>= 3.1, < 4.1)
|
|
haml (>= 3.1, < 4.1)
|
|
railties (>= 3.1, < 4.1)
|
|
hashie (1.2.0)
|
|
hike (1.2.2)
|
|
hipchat (0.9.0)
|
|
httparty
|
|
http_parser.rb (0.5.3)
|
|
httparty (0.11.0)
|
|
multi_json (~> 1.0)
|
|
multi_xml (>= 0.5.2)
|
|
httpauth (0.2.0)
|
|
i18n (0.6.1)
|
|
journey (1.0.4)
|
|
jquery-atwho-rails (0.3.0)
|
|
jquery-rails (2.1.3)
|
|
railties (>= 3.1.0, < 5.0)
|
|
thor (~> 0.14)
|
|
jquery-turbolinks (1.0.0)
|
|
railties (>= 3.1.0)
|
|
turbolinks
|
|
jquery-ui-rails (2.0.2)
|
|
jquery-rails
|
|
railties (>= 3.1.0)
|
|
json (1.7.7)
|
|
jwt (0.1.8)
|
|
multi_json (>= 1.5)
|
|
kaminari (0.14.1)
|
|
actionpack (>= 3.0.0)
|
|
activesupport (>= 3.0.0)
|
|
launchy (2.2.0)
|
|
addressable (~> 2.3)
|
|
letter_opener (1.1.0)
|
|
launchy (~> 2.2.0)
|
|
libv8 (3.11.8.17)
|
|
listen (1.1.3)
|
|
rb-fsevent (>= 0.9.3)
|
|
rb-inotify (>= 0.9)
|
|
rb-kqueue (>= 0.2)
|
|
lumberjack (1.0.3)
|
|
mail (2.5.3)
|
|
i18n (>= 0.4.0)
|
|
mime-types (~> 1.16)
|
|
treetop (~> 1.4.8)
|
|
method_source (0.8.1)
|
|
mime-types (1.23)
|
|
minitest (4.7.4)
|
|
modernizr (2.6.2)
|
|
sprockets (~> 2.0)
|
|
multi_json (1.7.3)
|
|
multi_xml (0.5.3)
|
|
multipart-post (1.2.0)
|
|
mysql2 (0.3.11)
|
|
net-ldap (0.2.2)
|
|
nokogiri (1.5.9)
|
|
oauth (0.4.7)
|
|
oauth2 (0.8.1)
|
|
faraday (~> 0.8)
|
|
httpauth (~> 0.1)
|
|
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 (~> 1.0)
|
|
omniauth-oauth2 (~> 1.1)
|
|
omniauth-google-oauth2 (0.1.17)
|
|
omniauth (~> 1.0)
|
|
omniauth-oauth2
|
|
omniauth-oauth (1.0.1)
|
|
oauth
|
|
omniauth (~> 1.0)
|
|
omniauth-oauth2 (1.1.1)
|
|
oauth2 (~> 0.8.0)
|
|
omniauth (~> 1.0)
|
|
omniauth-twitter (0.0.16)
|
|
multi_json (~> 1.3)
|
|
omniauth-oauth (~> 1.0)
|
|
orm_adapter (0.4.0)
|
|
pg (0.15.1)
|
|
poltergeist (1.3.0)
|
|
capybara (~> 2.1.0)
|
|
faye-websocket (>= 0.4.4, < 0.5.0)
|
|
http_parser.rb (~> 0.5.3)
|
|
polyglot (0.3.3)
|
|
posix-spawn (0.3.6)
|
|
pry (0.9.12.2)
|
|
coderay (~> 1.0.5)
|
|
method_source (~> 0.8)
|
|
slop (~> 3.4)
|
|
puma (2.0.1)
|
|
rack (>= 1.1, < 2.0)
|
|
pygments.rb (0.4.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 (>= 0.4)
|
|
rack-cache (1.2)
|
|
rack (>= 0.4)
|
|
rack-mini-profiler (0.1.26)
|
|
rack (>= 1.1.3)
|
|
rack-mount (0.8.3)
|
|
rack (>= 1.0.0)
|
|
rack-protection (1.5.0)
|
|
rack
|
|
rack-ssl (1.3.3)
|
|
rack
|
|
rack-test (0.6.2)
|
|
rack (>= 1.0)
|
|
rails (3.2.13)
|
|
actionmailer (= 3.2.13)
|
|
actionpack (= 3.2.13)
|
|
activerecord (= 3.2.13)
|
|
activeresource (= 3.2.13)
|
|
activesupport (= 3.2.13)
|
|
bundler (~> 1.0)
|
|
railties (= 3.2.13)
|
|
rails-dev-tweaks (0.6.1)
|
|
actionpack (~> 3.1)
|
|
railties (~> 3.1)
|
|
rails_best_practices (1.13.4)
|
|
activesupport
|
|
awesome_print
|
|
code_analyzer
|
|
colored
|
|
erubis
|
|
i18n
|
|
ruby-progressbar
|
|
railties (3.2.13)
|
|
actionpack (= 3.2.13)
|
|
activesupport (= 3.2.13)
|
|
rack-ssl (~> 1.3.2)
|
|
rake (>= 0.8.7)
|
|
rdoc (~> 3.4)
|
|
thor (>= 0.14.6, < 2.0)
|
|
rake (10.0.4)
|
|
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)
|
|
json (~> 1.4)
|
|
redcarpet (2.2.2)
|
|
redis (3.0.4)
|
|
redis-actionpack (3.2.3)
|
|
actionpack (~> 3.2.3)
|
|
redis-rack (~> 1.4.0)
|
|
redis-store (~> 1.1.0)
|
|
redis-activesupport (3.2.3)
|
|
activesupport (~> 3.2.3)
|
|
redis-store (~> 1.1.0)
|
|
redis-namespace (1.3.0)
|
|
redis (~> 3.0.0)
|
|
redis-rack (1.4.2)
|
|
rack (~> 1.4.1)
|
|
redis-store (~> 1.1.0)
|
|
redis-rails (3.2.3)
|
|
redis-actionpack (~> 3.2.3)
|
|
redis-activesupport (~> 3.2.3)
|
|
redis-store (~> 1.1.0)
|
|
redis-store (1.1.3)
|
|
redis (>= 2.2.0)
|
|
ref (1.0.4)
|
|
rest-client (1.6.7)
|
|
mime-types (>= 1.16)
|
|
rspec (2.13.0)
|
|
rspec-core (~> 2.13.0)
|
|
rspec-expectations (~> 2.13.0)
|
|
rspec-mocks (~> 2.13.0)
|
|
rspec-core (2.13.1)
|
|
rspec-expectations (2.13.0)
|
|
diff-lcs (>= 1.1.3, < 2.0)
|
|
rspec-mocks (2.13.1)
|
|
rspec-rails (2.13.1)
|
|
actionpack (>= 3.0)
|
|
activesupport (>= 3.0)
|
|
railties (>= 3.0)
|
|
rspec-core (~> 2.13.0)
|
|
rspec-expectations (~> 2.13.0)
|
|
rspec-mocks (~> 2.13.0)
|
|
ruby-progressbar (1.0.2)
|
|
rubyntlm (0.1.1)
|
|
sanitize (2.0.3)
|
|
nokogiri (>= 1.4.4, < 1.6)
|
|
sass (3.2.9)
|
|
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)
|
|
seed-fu (2.2.0)
|
|
activerecord (~> 3.1)
|
|
activesupport (~> 3.1)
|
|
select2-rails (3.3.1)
|
|
sass-rails (>= 3.2)
|
|
thor (~> 0.14)
|
|
settingslogic (2.0.9)
|
|
sexp_processor (4.2.1)
|
|
shoulda-matchers (2.1.0)
|
|
activesupport (>= 3.0.0)
|
|
sidekiq (2.12.0)
|
|
celluloid (>= 0.14.0)
|
|
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)
|
|
simplecov-html (0.7.1)
|
|
sinatra (1.3.6)
|
|
rack (~> 1.4)
|
|
rack-protection (~> 1.3)
|
|
tilt (~> 1.3, >= 1.3.3)
|
|
six (0.2.0)
|
|
slim (1.3.8)
|
|
temple (~> 0.6.3)
|
|
tilt (~> 1.3.3)
|
|
slop (3.4.5)
|
|
spinach (0.8.2)
|
|
colorize (= 0.5.8)
|
|
gherkin-ruby (~> 0.3.0)
|
|
spinach-rails (0.2.1)
|
|
capybara (>= 2.0.0)
|
|
railties (>= 3)
|
|
spinach (>= 0.4)
|
|
spork (1.0.0rc3)
|
|
sprockets (2.2.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.4)
|
|
test_after_commit (0.2.0)
|
|
therubyracer (0.11.4)
|
|
libv8 (~> 3.11.8.12)
|
|
ref
|
|
thin (1.5.1)
|
|
daemons (>= 1.0.9)
|
|
eventmachine (>= 0.12.6)
|
|
rack (>= 1.0.0)
|
|
thor (0.18.1)
|
|
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.12)
|
|
polyglot
|
|
polyglot (>= 0.3.1)
|
|
turbolinks (1.1.1)
|
|
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.0.1)
|
|
execjs (>= 0.3.0)
|
|
multi_json (~> 1.0, >= 1.0.2)
|
|
virtus (0.5.4)
|
|
backports (~> 2.6.1)
|
|
descendants_tracker (~> 0.0.1)
|
|
warden (1.2.1)
|
|
rack (>= 1.0)
|
|
webmock (1.11.0)
|
|
addressable (>= 2.2.7)
|
|
crack (>= 0.3.2)
|
|
xpath (2.0.0)
|
|
nokogiri (~> 1.3)
|
|
yajl-ruby (1.1.0)
|
|
|
|
PLATFORMS
|
|
ruby
|
|
|
|
DEPENDENCIES
|
|
acts-as-taggable-on
|
|
annotate!
|
|
awesome_print
|
|
better_errors
|
|
binding_of_caller
|
|
bootstrap-sass
|
|
capybara
|
|
carrierwave
|
|
chosen-rails (= 0.9.8)
|
|
coffee-rails
|
|
colored
|
|
coveralls
|
|
database_cleaner
|
|
devise
|
|
email_spec
|
|
enumerize
|
|
factory_girl_rails
|
|
ffaker
|
|
font-awesome-sass-rails (~> 3.0.0)
|
|
foreman
|
|
gemoji (~> 1.2.1)
|
|
github-linguist
|
|
github-markup (~> 0.7.4)
|
|
gitlab-gollum-lib (~> 1.0.0)
|
|
gitlab-grack (~> 1.0.0)
|
|
gitlab-pygments.rb (~> 0.3.2)
|
|
gitlab_git (~> 1.2.1)
|
|
gitlab_meta (= 5.0)
|
|
gitlab_omniauth-ldap (= 1.0.2)
|
|
gon
|
|
grape
|
|
grape-entity
|
|
growl
|
|
guard-rspec
|
|
guard-spinach
|
|
haml-rails
|
|
hipchat (~> 0.9.0)
|
|
httparty
|
|
jquery-atwho-rails (= 0.3.0)
|
|
jquery-rails (= 2.1.3)
|
|
jquery-turbolinks
|
|
jquery-ui-rails (= 2.0.2)
|
|
kaminari (~> 0.14.1)
|
|
launchy
|
|
letter_opener
|
|
minitest
|
|
modernizr (= 2.6.2)
|
|
mysql2
|
|
omniauth (~> 1.1.3)
|
|
omniauth-github
|
|
omniauth-google-oauth2
|
|
omniauth-twitter
|
|
pg
|
|
poltergeist (~> 1.3.0)
|
|
pry
|
|
puma (~> 2.0.1)
|
|
quiet_assets (~> 1.0.1)
|
|
rack-mini-profiler
|
|
rails (= 3.2.13)
|
|
rails-dev-tweaks
|
|
rails_best_practices
|
|
raphael-rails!
|
|
rb-fsevent
|
|
rb-inotify
|
|
redcarpet (~> 2.2.2)
|
|
redis-rails
|
|
rspec-rails
|
|
sass-rails
|
|
sdoc
|
|
seed-fu
|
|
select2-rails
|
|
settingslogic
|
|
shoulda-matchers (~> 2.1.0)
|
|
sidekiq
|
|
simplecov
|
|
sinatra
|
|
six
|
|
slim
|
|
spinach-rails
|
|
spork (~> 1.0rc)
|
|
stamp
|
|
state_machine
|
|
test_after_commit
|
|
therubyracer
|
|
thin
|
|
tinder (~> 1.9.2)
|
|
turbolinks
|
|
uglifier
|
|
webmock
|