Merge branch 'blackst0ne-rails5-update-state_machines-activerecord-gem' into 'master'
Bump `state_machines-activerecord` to `0.5.1` See merge request gitlab-org/gitlab-ce!17924
This commit is contained in:
Douwe Maan
commit
a1cde68d20
4 changed files with 71 additions and 77 deletions
2
Gemfile
2
Gemfile
|
|
@ -162,7 +162,7 @@ group :unicorn do
|
|||
end
|
||||
|
||||
# State machine
|
||||
gem 'state_machines-activerecord', '~> 0.4.0'
|
||||
gem 'state_machines-activerecord', '~> 0.5.1'
|
||||
|
||||
# Issue tags
|
||||
gem 'acts-as-taggable-on', '~> 5.0'
|
||||
|
|
|
|||
16
Gemfile.lock
16
Gemfile.lock
|
|
@ -897,13 +897,13 @@ GEM
|
|||
sqlite3 (1.3.13)
|
||||
sshkey (1.9.0)
|
||||
stackprof (0.2.10)
|
||||
state_machines (0.4.0)
|
||||
state_machines-activemodel (0.4.0)
|
||||
activemodel (>= 4.1, < 5.1)
|
||||
state_machines (>= 0.4.0)
|
||||
state_machines-activerecord (0.4.0)
|
||||
activerecord (>= 4.1, < 5.1)
|
||||
state_machines-activemodel (>= 0.3.0)
|
||||
state_machines (0.5.0)
|
||||
state_machines-activemodel (0.5.1)
|
||||
activemodel (>= 4.1, < 6.0)
|
||||
state_machines (>= 0.5.0)
|
||||
state_machines-activerecord (0.5.1)
|
||||
activerecord (>= 4.1, < 6.0)
|
||||
state_machines-activemodel (>= 0.5.0)
|
||||
stringex (2.7.1)
|
||||
sys-filesystem (1.1.6)
|
||||
ffi
|
||||
|
|
@ -1194,7 +1194,7 @@ DEPENDENCIES
|
|||
sprockets (~> 3.7.0)
|
||||
sshkey (~> 1.9.0)
|
||||
stackprof (~> 0.2.10)
|
||||
state_machines-activerecord (~> 0.4.0)
|
||||
state_machines-activerecord (~> 0.5.1)
|
||||
sys-filesystem (~> 1.1.6)
|
||||
test-prof (~> 0.2.5)
|
||||
test_after_commit (~> 1.1)
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ GEM
|
|||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
tzinfo (~> 1.1)
|
||||
acts-as-taggable-on (4.0.0)
|
||||
activerecord (>= 4.0)
|
||||
acts-as-taggable-on (5.0.0)
|
||||
activerecord (>= 4.2.8)
|
||||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
|
|
@ -178,10 +178,10 @@ GEM
|
|||
docile (1.1.5)
|
||||
domain_name (0.5.20170404)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
doorkeeper (4.2.6)
|
||||
doorkeeper (4.3.1)
|
||||
railties (>= 4.2)
|
||||
doorkeeper-openid_connect (1.2.0)
|
||||
doorkeeper (~> 4.0)
|
||||
doorkeeper-openid_connect (1.3.0)
|
||||
doorkeeper (~> 4.3)
|
||||
json-jwt (~> 1.6)
|
||||
dropzonejs-rails (0.7.4)
|
||||
rails (> 3.1)
|
||||
|
|
@ -220,13 +220,13 @@ GEM
|
|||
path_expander (~> 1.0)
|
||||
ruby_parser (~> 3.0)
|
||||
sexp_processor (~> 4.0)
|
||||
flipper (0.11.0)
|
||||
flipper-active_record (0.11.0)
|
||||
flipper (0.13.0)
|
||||
flipper-active_record (0.13.0)
|
||||
activerecord (>= 3.2, < 6)
|
||||
flipper (~> 0.11.0)
|
||||
flipper-active_support_cache_store (0.11.0)
|
||||
flipper (~> 0.13.0)
|
||||
flipper-active_support_cache_store (0.13.0)
|
||||
activesupport (>= 3.2, < 6)
|
||||
flipper (~> 0.11.0)
|
||||
flipper (~> 0.13.0)
|
||||
flowdock (0.7.1)
|
||||
httparty (~> 0.7)
|
||||
multi_json
|
||||
|
|
@ -235,7 +235,7 @@ GEM
|
|||
fog-json (~> 1.0)
|
||||
ipaddress (~> 0.8)
|
||||
xml-simple (~> 1.1)
|
||||
fog-aws (1.4.1)
|
||||
fog-aws (2.0.1)
|
||||
fog-core (~> 1.38)
|
||||
fog-json (~> 1.0)
|
||||
fog-xml (~> 0.1)
|
||||
|
|
@ -267,7 +267,7 @@ GEM
|
|||
nokogiri (>= 1.5.11, < 2.0.0)
|
||||
font-awesome-rails (4.7.0.3)
|
||||
railties (>= 3.2, < 5.2)
|
||||
foreman (0.78.0)
|
||||
foreman (0.84.0)
|
||||
thor (~> 0.19.1)
|
||||
formatador (0.2.5)
|
||||
fuubar (2.2.0)
|
||||
|
|
@ -283,7 +283,7 @@ GEM
|
|||
text (>= 1.3.0)
|
||||
gettext_i18n_rails (1.8.0)
|
||||
fast_gettext (>= 0.9.0)
|
||||
gettext_i18n_rails_js (1.2.0)
|
||||
gettext_i18n_rails_js (1.3.0)
|
||||
gettext (>= 3.0.2)
|
||||
gettext_i18n_rails (>= 0.7.1)
|
||||
po_to_json (>= 1.0.0)
|
||||
|
|
@ -337,9 +337,9 @@ GEM
|
|||
json
|
||||
multi_json
|
||||
request_store (>= 1.0)
|
||||
google-api-client (0.13.6)
|
||||
google-api-client (0.19.8)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (~> 0.5)
|
||||
googleauth (>= 0.5, < 0.7.0)
|
||||
httpclient (>= 2.8.1, < 3.0)
|
||||
mime-types (~> 3.0)
|
||||
representable (~> 3.0)
|
||||
|
|
@ -404,7 +404,7 @@ GEM
|
|||
html2text (0.2.1)
|
||||
nokogiri (~> 1.6)
|
||||
htmlentities (4.3.4)
|
||||
http (0.9.8)
|
||||
http (2.2.2)
|
||||
addressable (~> 2.3)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 1.0.1)
|
||||
|
|
@ -427,10 +427,6 @@ GEM
|
|||
multipart-post
|
||||
oauth (~> 0.5, >= 0.5.0)
|
||||
jquery-atwho-rails (1.3.2)
|
||||
jquery-rails (4.3.1)
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.6)
|
||||
json-jwt (1.9.2)
|
||||
activesupport
|
||||
|
|
@ -454,13 +450,12 @@ GEM
|
|||
kaminari-core (= 1.1.1)
|
||||
kaminari-core (1.1.1)
|
||||
kgio (2.11.2)
|
||||
knapsack (1.11.1)
|
||||
knapsack (1.16.0)
|
||||
rake
|
||||
timecop (>= 0.1.0)
|
||||
kubeclient (2.2.0)
|
||||
http (= 0.9.8)
|
||||
recursive-open-struct (= 1.0.0)
|
||||
rest-client
|
||||
kubeclient (3.0.0)
|
||||
http (~> 2.2.2)
|
||||
recursive-open-struct (~> 1.0.4)
|
||||
rest-client (~> 2.0)
|
||||
launchy (2.4.3)
|
||||
addressable (~> 2.3)
|
||||
letter_opener (1.6.0)
|
||||
|
|
@ -477,7 +472,7 @@ GEM
|
|||
toml (= 0.1.2)
|
||||
with_env (> 1.0)
|
||||
xml-simple
|
||||
licensee (8.7.0)
|
||||
licensee (8.9.2)
|
||||
rugged (~> 0.24)
|
||||
little-plugger (1.1.4)
|
||||
locale (2.1.2)
|
||||
|
|
@ -514,7 +509,7 @@ GEM
|
|||
mustermann (~> 1.0.0)
|
||||
mysql2 (0.4.10)
|
||||
net-ldap (0.16.1)
|
||||
net-ssh (4.1.0)
|
||||
net-ssh (4.2.0)
|
||||
netrc (0.11.0)
|
||||
nio4r (2.2.0)
|
||||
nokogiri (1.8.2)
|
||||
|
|
@ -527,11 +522,10 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
rack (>= 1.2, < 3)
|
||||
octokit (4.6.2)
|
||||
octokit (4.8.0)
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
oj (2.17.5)
|
||||
omniauth (1.4.3)
|
||||
hashie (>= 1.2, < 4)
|
||||
omniauth (1.8.1)
|
||||
hashie (>= 3.4.6, < 3.6.0)
|
||||
rack (>= 1.6.2, < 3)
|
||||
omniauth-auth0 (1.4.2)
|
||||
omniauth-oauth2 (~> 1.1)
|
||||
|
|
@ -570,9 +564,9 @@ GEM
|
|||
omniauth (~> 1.2)
|
||||
omniauth-oauth2-generic (0.2.4)
|
||||
omniauth-oauth2 (~> 1.0)
|
||||
omniauth-saml (1.7.0)
|
||||
omniauth (~> 1.3)
|
||||
ruby-saml (~> 1.4)
|
||||
omniauth-saml (1.10.0)
|
||||
omniauth (~> 1.3, >= 1.3.2)
|
||||
ruby-saml (~> 1.7)
|
||||
omniauth-shibboleth (1.2.1)
|
||||
omniauth (>= 1.0.0)
|
||||
omniauth-twitter (1.2.1)
|
||||
|
|
@ -598,8 +592,6 @@ GEM
|
|||
railties (>= 4.0.0)
|
||||
peek-gc (0.0.2)
|
||||
peek
|
||||
peek-host (1.0.0)
|
||||
peek
|
||||
peek-mysql2 (1.1.0)
|
||||
atomic (>= 1.0.0)
|
||||
mysql2
|
||||
|
|
@ -713,7 +705,7 @@ GEM
|
|||
re2 (1.1.1)
|
||||
recaptcha (3.4.0)
|
||||
json
|
||||
recursive-open-struct (1.0.0)
|
||||
recursive-open-struct (1.0.5)
|
||||
redcarpet (3.4.0)
|
||||
redis (3.3.5)
|
||||
redis-actionpack (5.0.2)
|
||||
|
|
@ -805,7 +797,7 @@ GEM
|
|||
i18n
|
||||
ruby-fogbugz (0.2.1)
|
||||
crack (~> 0.4)
|
||||
ruby-prof (0.16.2)
|
||||
ruby-prof (0.17.0)
|
||||
ruby-progressbar (1.9.0)
|
||||
ruby-saml (1.7.2)
|
||||
nokogiri (>= 1.5.10)
|
||||
|
|
@ -846,7 +838,7 @@ GEM
|
|||
selenium-webdriver (3.11.0)
|
||||
childprocess (~> 0.5)
|
||||
rubyzip (~> 1.2)
|
||||
sentry-raven (2.5.3)
|
||||
sentry-raven (2.7.2)
|
||||
faraday (>= 0.7.6, < 1.0)
|
||||
settingslogic (2.0.9)
|
||||
sexp_processor (4.10.1)
|
||||
|
|
@ -903,12 +895,12 @@ GEM
|
|||
sshkey (1.9.0)
|
||||
stackprof (0.2.11)
|
||||
state_machines (0.5.0)
|
||||
state_machines-activemodel (0.5.0)
|
||||
activemodel (>= 4.1, < 5.2)
|
||||
state_machines-activemodel (0.5.1)
|
||||
activemodel (>= 4.1, < 6.0)
|
||||
state_machines (>= 0.5.0)
|
||||
state_machines-activerecord (0.4.1)
|
||||
activerecord (>= 4.1, < 5.2)
|
||||
state_machines-activemodel (>= 0.3.0)
|
||||
state_machines-activerecord (0.5.1)
|
||||
activerecord (>= 4.1, < 6.0)
|
||||
state_machines-activemodel (>= 0.5.0)
|
||||
stringex (2.8.4)
|
||||
sys-filesystem (1.1.9)
|
||||
ffi
|
||||
|
|
@ -998,7 +990,7 @@ DEPENDENCIES
|
|||
RedCloth (~> 4.3.2)
|
||||
ace-rails-ap (~> 4.1.0)
|
||||
activerecord_sane_schema_dumper (= 1.0)
|
||||
acts-as-taggable-on (~> 4.0)
|
||||
acts-as-taggable-on (~> 5.0)
|
||||
addressable (~> 2.5.2)
|
||||
akismet (~> 2.0)
|
||||
allocations (~> 1.0)
|
||||
|
|
@ -1038,8 +1030,8 @@ DEPENDENCIES
|
|||
devise (~> 4.2)
|
||||
devise-two-factor (~> 3.0.0)
|
||||
diffy (~> 3.1.0)
|
||||
doorkeeper (~> 4.2.0)
|
||||
doorkeeper-openid_connect (~> 1.2.0)
|
||||
doorkeeper (~> 4.3)
|
||||
doorkeeper-openid_connect (~> 1.3)
|
||||
dropzonejs-rails (~> 0.7.1)
|
||||
email_reply_trimmer (~> 0.1)
|
||||
email_spec (~> 1.6.0)
|
||||
|
|
@ -1048,24 +1040,24 @@ DEPENDENCIES
|
|||
fast_blank
|
||||
ffaker (~> 2.4)
|
||||
flay (~> 2.10.0)
|
||||
flipper (~> 0.11.0)
|
||||
flipper-active_record (~> 0.11.0)
|
||||
flipper-active_support_cache_store (~> 0.11.0)
|
||||
flipper (~> 0.13.0)
|
||||
flipper-active_record (~> 0.13.0)
|
||||
flipper-active_support_cache_store (~> 0.13.0)
|
||||
fog-aliyun (~> 0.2.0)
|
||||
fog-aws (~> 1.4)
|
||||
fog-aws (~> 2.0)
|
||||
fog-core (~> 1.44)
|
||||
fog-google (~> 0.5)
|
||||
fog-local (~> 0.3)
|
||||
fog-openstack (~> 0.1)
|
||||
fog-rackspace (~> 0.1.1)
|
||||
font-awesome-rails (~> 4.7)
|
||||
foreman (~> 0.78.0)
|
||||
foreman (~> 0.84.0)
|
||||
fuubar (~> 2.2.0)
|
||||
gemnasium-gitlab-service (~> 0.2)
|
||||
gemojione (~> 3.3)
|
||||
gettext (~> 3.2.2)
|
||||
gettext_i18n_rails (~> 1.8.0)
|
||||
gettext_i18n_rails_js (~> 1.2.0)
|
||||
gettext_i18n_rails_js (~> 1.3)
|
||||
gitaly-proto (~> 0.88.0)
|
||||
github-linguist (~> 5.3.3)
|
||||
gitlab-flowdock-git-hook (~> 1.0.1)
|
||||
|
|
@ -1075,7 +1067,7 @@ DEPENDENCIES
|
|||
gollum-lib (~> 4.2)
|
||||
gollum-rugged_adapter (~> 0.4.4)
|
||||
gon (~> 6.1.0)
|
||||
google-api-client (~> 0.13.6)
|
||||
google-api-client (~> 0.19.8)
|
||||
google-protobuf (= 3.5.1)
|
||||
gpgme
|
||||
grape (~> 1.0)
|
||||
|
|
@ -1094,15 +1086,14 @@ DEPENDENCIES
|
|||
influxdb (~> 0.2)
|
||||
jira-ruby (~> 1.4)
|
||||
jquery-atwho-rails (~> 1.3.2)
|
||||
jquery-rails (~> 4.3.1)
|
||||
json-schema (~> 2.8.0)
|
||||
jwt (~> 1.5.6)
|
||||
kaminari (~> 1.0)
|
||||
knapsack (~> 1.11.0)
|
||||
kubeclient (~> 2.2.0)
|
||||
knapsack (~> 1.16)
|
||||
kubeclient (~> 3.0)
|
||||
letter_opener_web (~> 1.3.0)
|
||||
license_finder (~> 3.1)
|
||||
licensee (~> 8.7.0)
|
||||
licensee (~> 8.9)
|
||||
lograge (~> 0.5)
|
||||
loofah (~> 2.0.3)
|
||||
mail_room (~> 0.9.1)
|
||||
|
|
@ -1111,12 +1102,11 @@ DEPENDENCIES
|
|||
mousetrap-rails (~> 1.4.6)
|
||||
mysql2 (~> 0.4.10)
|
||||
net-ldap
|
||||
net-ssh (~> 4.1.0)
|
||||
net-ssh (~> 4.2.0)
|
||||
nokogiri (~> 1.8.2)
|
||||
oauth2 (~> 1.4)
|
||||
octokit (~> 4.6.2)
|
||||
oj (~> 2.17.4)
|
||||
omniauth (~> 1.4.2)
|
||||
octokit (~> 4.8)
|
||||
omniauth (~> 1.8)
|
||||
omniauth-auth0 (~> 1.4.1)
|
||||
omniauth-authentiq (~> 0.3.1)
|
||||
omniauth-azure-oauth2 (~> 0.0.9)
|
||||
|
|
@ -1127,14 +1117,13 @@ DEPENDENCIES
|
|||
omniauth-google-oauth2 (~> 0.5.2)
|
||||
omniauth-kerberos (~> 0.3.0)
|
||||
omniauth-oauth2-generic (~> 0.2.2)
|
||||
omniauth-saml (~> 1.7.0)
|
||||
omniauth-saml (~> 1.10)
|
||||
omniauth-shibboleth (~> 1.2.0)
|
||||
omniauth-twitter (~> 1.2.0)
|
||||
omniauth_crowd (~> 2.2.0)
|
||||
org-ruby (~> 0.9.12)
|
||||
peek (~> 1.0.1)
|
||||
peek-gc (~> 0.0.2)
|
||||
peek-host (~> 1.0.0)
|
||||
peek-mysql2 (~> 1.1.0)
|
||||
peek-performance_bar (~> 1.3.0)
|
||||
peek-pg (~> 1.3.0)
|
||||
|
|
@ -1177,7 +1166,7 @@ DEPENDENCIES
|
|||
rubocop (~> 0.52.1)
|
||||
rubocop-rspec (~> 1.22.1)
|
||||
ruby-fogbugz (~> 0.2.1)
|
||||
ruby-prof (~> 0.16.2)
|
||||
ruby-prof (~> 0.17.0)
|
||||
ruby_parser (~> 3.8)
|
||||
rufus-scheduler (~> 3.4)
|
||||
rugged (~> 0.26.0)
|
||||
|
|
@ -1187,7 +1176,7 @@ DEPENDENCIES
|
|||
seed-fu (~> 2.3.7)
|
||||
select2-rails (~> 3.5.9)
|
||||
selenium-webdriver (~> 3.5)
|
||||
sentry-raven (~> 2.5.3)
|
||||
sentry-raven (~> 2.7)
|
||||
settingslogic (~> 2.0.9)
|
||||
sham_rack (~> 1.3.6)
|
||||
shoulda-matchers (~> 3.1.2)
|
||||
|
|
@ -1205,7 +1194,7 @@ DEPENDENCIES
|
|||
sprockets (~> 3.7.0)
|
||||
sshkey (~> 1.9.0)
|
||||
stackprof (~> 0.2.10)
|
||||
state_machines-activerecord (~> 0.4.0)
|
||||
state_machines-activerecord (~> 0.5.1)
|
||||
sys-filesystem (~> 1.1.6)
|
||||
test-prof (~> 0.2.5)
|
||||
test_after_commit (~> 1.1)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Bump `state_machines-activerecord` to 0.5.1
|
||||
merge_request: 17924
|
||||
author: blackst0ne
|
||||
type: other
|
||||
Loading…
Reference in a new issue