Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
3a87e685
Commit
3a87e685
authored
May 11, 2018
by
blackst0ne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Rails5] Bump Rails to 5.0.7 and set `atomic` to 1.1.99
atomic 1.1.100 was yanked by its author.
parent
35816eb7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
59 additions
and
63 deletions
+59
-63
Gemfile
Gemfile
+1
-1
Gemfile.rails5.lock
Gemfile.rails5.lock
+58
-62
No files found.
Gemfile
View file @
3a87e685
...
@@ -6,7 +6,7 @@ end
...
@@ -6,7 +6,7 @@ end
gem_versions
=
{}
gem_versions
=
{}
gem_versions
[
'activerecord_sane_schema_dumper'
]
=
rails5?
?
'1.0'
:
'0.2'
gem_versions
[
'activerecord_sane_schema_dumper'
]
=
rails5?
?
'1.0'
:
'0.2'
gem_versions
[
'default_value_for'
]
=
rails5?
?
'~> 3.0.5'
:
'~> 3.0.0'
gem_versions
[
'default_value_for'
]
=
rails5?
?
'~> 3.0.5'
:
'~> 3.0.0'
gem_versions
[
'rails'
]
=
rails5?
?
'5.0.
6
'
:
'4.2.10'
gem_versions
[
'rails'
]
=
rails5?
?
'5.0.
7
'
:
'4.2.10'
gem_versions
[
'rails-i18n'
]
=
rails5?
?
'~> 5.1'
:
'~> 4.0.9'
gem_versions
[
'rails-i18n'
]
=
rails5?
?
'~> 5.1'
:
'~> 4.0.9'
# --- The end of special code for migrating to Rails 5.0 ---
# --- The end of special code for migrating to Rails 5.0 ---
...
...
Gemfile.rails5.lock
View file @
3a87e685
...
@@ -4,43 +4,43 @@ GEM
...
@@ -4,43 +4,43 @@ GEM
RedCloth (4.3.2)
RedCloth (4.3.2)
abstract_type (0.0.7)
abstract_type (0.0.7)
ace-rails-ap (4.1.4)
ace-rails-ap (4.1.4)
actioncable (5.0.
6
)
actioncable (5.0.
7
)
actionpack (= 5.0.
6
)
actionpack (= 5.0.
7
)
nio4r (>= 1.2, < 3.0)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
websocket-driver (~> 0.6.1)
actionmailer (5.0.
6
)
actionmailer (5.0.
7
)
actionpack (= 5.0.
6
)
actionpack (= 5.0.
7
)
actionview (= 5.0.
6
)
actionview (= 5.0.
7
)
activejob (= 5.0.
6
)
activejob (= 5.0.
7
)
mail (~> 2.5, >= 2.5.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
rails-dom-testing (~> 2.0)
actionpack (5.0.
6
)
actionpack (5.0.
7
)
actionview (= 5.0.
6
)
actionview (= 5.0.
7
)
activesupport (= 5.0.
6
)
activesupport (= 5.0.
7
)
rack (~> 2.0)
rack (~> 2.0)
rack-test (~> 0.6.3)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.
6
)
actionview (5.0.
7
)
activesupport (= 5.0.
6
)
activesupport (= 5.0.
7
)
builder (~> 3.1)
builder (~> 3.1)
erubis (~> 2.7.0)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.
6
)
activejob (5.0.
7
)
activesupport (= 5.0.
6
)
activesupport (= 5.0.
7
)
globalid (>= 0.3.6)
globalid (>= 0.3.6)
activemodel (5.0.
6
)
activemodel (5.0.
7
)
activesupport (= 5.0.
6
)
activesupport (= 5.0.
7
)
activerecord (5.0.
6
)
activerecord (5.0.
7
)
activemodel (= 5.0.
6
)
activemodel (= 5.0.
7
)
activesupport (= 5.0.
6
)
activesupport (= 5.0.
7
)
arel (~> 7.0)
arel (~> 7.0)
activerecord_sane_schema_dumper (1.0)
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
rails (>= 5, < 6)
activesupport (5.0.
6
)
activesupport (5.0.
7
)
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (
~> 0.7
)
i18n (
>= 0.7, < 2
)
minitest (~> 5.1)
minitest (~> 5.1)
tzinfo (~> 1.1)
tzinfo (~> 1.1)
acts-as-taggable-on (5.0.0)
acts-as-taggable-on (5.0.0)
...
@@ -62,13 +62,13 @@ GEM
...
@@ -62,13 +62,13 @@ GEM
asciidoctor (1.5.6.1)
asciidoctor (1.5.6.1)
asciidoctor-plantuml (0.0.8)
asciidoctor-plantuml (0.0.8)
asciidoctor (~> 1.5)
asciidoctor (~> 1.5)
asset_sync (2.
2
.0)
asset_sync (2.
4
.0)
activemodel (>= 4.1.0)
activemodel (>= 4.1.0)
fog-core
fog-core
mime-types (>= 2.99)
mime-types (>= 2.99)
unf
unf
ast (2.4.0)
ast (2.4.0)
atomic (1.1.
100
)
atomic (1.1.
99
)
attr_encrypted (3.1.0)
attr_encrypted (3.1.0)
encryptor (~> 3.0.0)
encryptor (~> 3.0.0)
attr_required (1.0.1)
attr_required (1.0.1)
...
@@ -144,12 +144,10 @@ GEM
...
@@ -144,12 +144,10 @@ GEM
connection_pool (2.2.1)
connection_pool (2.2.1)
crack (0.4.3)
crack (0.4.3)
safe_yaml (~> 1.0.0)
safe_yaml (~> 1.0.0)
crass (1.0.
3
)
crass (1.0.
4
)
creole (0.5.0)
creole (0.5.0)
css_parser (1.6.0)
css_parser (1.6.0)
addressable
addressable
d3_rails (3.5.17)
railties (>= 3.1.0)
daemons (1.2.6)
daemons (1.2.6)
database_cleaner (1.5.3)
database_cleaner (1.5.3)
debug_inspector (0.0.3)
debug_inspector (0.0.3)
...
@@ -292,7 +290,7 @@ GEM
...
@@ -292,7 +290,7 @@ GEM
po_to_json (>= 1.0.0)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
gherkin-ruby (0.3.2)
gitaly-proto (0.9
7
.0)
gitaly-proto (0.9
9
.0)
google-protobuf (~> 3.1)
google-protobuf (~> 3.1)
grpc (~> 1.10)
grpc (~> 1.10)
github-linguist (5.3.3)
github-linguist (5.3.3)
...
@@ -335,9 +333,8 @@ GEM
...
@@ -335,9 +333,8 @@ GEM
activesupport (>= 4.2.0)
activesupport (>= 4.2.0)
gollum-grit_adapter (1.0.1)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gon (6.
1
.0)
gon (6.
2
.0)
actionpack (>= 3.0)
actionpack (>= 3.0)
json
multi_json
multi_json
request_store (>= 1.0)
request_store (>= 1.0)
google-api-client (0.19.8)
google-api-client (0.19.8)
...
@@ -367,8 +364,8 @@ GEM
...
@@ -367,8 +364,8 @@ GEM
rack (>= 1.3.0)
rack (>= 1.3.0)
rack-accept
rack-accept
virtus (>= 1.0.0)
virtus (>= 1.0.0)
grape-entity (0.
6
.1)
grape-entity (0.
7
.1)
activesupport (>=
5.0
.0)
activesupport (>=
4
.0)
multi_json (>= 1.3.2)
multi_json (>= 1.3.2)
grape-route-helpers (2.1.0)
grape-route-helpers (2.1.0)
activesupport
activesupport
...
@@ -420,7 +417,7 @@ GEM
...
@@ -420,7 +417,7 @@ GEM
json (~> 1.8)
json (~> 1.8)
multi_xml (>= 0.5.2)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
httpclient (2.8.3)
i18n (
0.9.5
)
i18n (
1.0.1
)
concurrent-ruby (~> 1.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
ice_nine (0.11.2)
influxdb (0.5.3)
influxdb (0.5.3)
...
@@ -515,7 +512,7 @@ GEM
...
@@ -515,7 +512,7 @@ GEM
net-ldap (0.16.1)
net-ldap (0.16.1)
net-ssh (4.2.0)
net-ssh (4.2.0)
netrc (0.11.0)
netrc (0.11.0)
nio4r (2.
2.0
)
nio4r (2.
3.1
)
nokogiri (1.8.2)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
mini_portile2 (~> 2.3.0)
numerizer (0.1.1)
numerizer (0.1.1)
...
@@ -545,9 +542,9 @@ GEM
...
@@ -545,9 +542,9 @@ GEM
omniauth (~> 1.2)
omniauth (~> 1.2)
omniauth-facebook (4.0.0)
omniauth-facebook (4.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.
1.2
)
omniauth-github (1.
3.0
)
omniauth (~> 1.
0
)
omniauth (~> 1.
5
)
omniauth-oauth2 (
~> 1.1
)
omniauth-oauth2 (
>= 1.4.0, < 2.0
)
omniauth-gitlab (1.0.3)
omniauth-gitlab (1.0.3)
omniauth (~> 1.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-oauth2 (~> 1.0)
...
@@ -633,7 +630,7 @@ GEM
...
@@ -633,7 +630,7 @@ GEM
parser
parser
unparser
unparser
procto (0.0.3)
procto (0.0.3)
prometheus-client-mmap (0.9.
1
)
prometheus-client-mmap (0.9.
2
)
pry (0.11.3)
pry (0.11.3)
coderay (~> 1.1.0)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
method_source (~> 0.9.0)
...
@@ -644,7 +641,7 @@ GEM
...
@@ -644,7 +641,7 @@ GEM
pry (>= 0.10.4)
pry (>= 0.10.4)
public_suffix (3.0.2)
public_suffix (3.0.2)
pyu-ruby-sasl (0.0.3.3)
pyu-ruby-sasl (0.0.3.3)
rack (2.0.
4
)
rack (2.0.
5
)
rack-accept (0.4.5)
rack-accept (0.4.5)
rack (>= 0.4)
rack (>= 0.4)
rack-attack (4.4.1)
rack-attack (4.4.1)
...
@@ -662,17 +659,17 @@ GEM
...
@@ -662,17 +659,17 @@ GEM
rack
rack
rack-test (0.6.3)
rack-test (0.6.3)
rack (>= 1.0)
rack (>= 1.0)
rails (5.0.
6
)
rails (5.0.
7
)
actioncable (= 5.0.
6
)
actioncable (= 5.0.
7
)
actionmailer (= 5.0.
6
)
actionmailer (= 5.0.
7
)
actionpack (= 5.0.
6
)
actionpack (= 5.0.
7
)
actionview (= 5.0.
6
)
actionview (= 5.0.
7
)
activejob (= 5.0.
6
)
activejob (= 5.0.
7
)
activemodel (= 5.0.
6
)
activemodel (= 5.0.
7
)
activerecord (= 5.0.
6
)
activerecord (= 5.0.
7
)
activesupport (= 5.0.
6
)
activesupport (= 5.0.
7
)
bundler (>= 1.3.0)
bundler (>= 1.3.0)
railties (= 5.0.
6
)
railties (= 5.0.
7
)
sprockets-rails (>= 2.0.0)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
actionpack (~> 5.x, >= 5.0.1)
...
@@ -683,21 +680,21 @@ GEM
...
@@ -683,21 +680,21 @@ GEM
rails-dom-testing (2.0.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.
3
)
rails-html-sanitizer (1.0.
4
)
loofah (~> 2.
0
)
loofah (~> 2.
2, >= 2.2.2
)
rails-i18n (5.1.1)
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (>= 5.0, < 6)
railties (5.0.
6
)
railties (5.0.
7
)
actionpack (= 5.0.
6
)
actionpack (= 5.0.
7
)
activesupport (= 5.0.
6
)
activesupport (= 5.0.
7
)
method_source
method_source
rake (>= 0.8.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rainbow (2.2.2)
rake
rake
raindrops (0.19.0)
raindrops (0.19.0)
rake (12.3.
0
)
rake (12.3.
1
)
rb-fsevent (0.10.3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ffi (>= 0.5.0, < 2)
...
@@ -1001,7 +998,7 @@ DEPENDENCIES
...
@@ -1001,7 +998,7 @@ DEPENDENCIES
asana (~> 0.6.0)
asana (~> 0.6.0)
asciidoctor (~> 1.5.6)
asciidoctor (~> 1.5.6)
asciidoctor-plantuml (= 0.0.8)
asciidoctor-plantuml (= 0.0.8)
asset_sync (~> 2.
2.0
)
asset_sync (~> 2.
4
)
attr_encrypted (~> 3.1.0)
attr_encrypted (~> 3.1.0)
awesome_print (~> 1.2.0)
awesome_print (~> 1.2.0)
babosa (~> 1.0.2)
babosa (~> 1.0.2)
...
@@ -1027,12 +1024,11 @@ DEPENDENCIES
...
@@ -1027,12 +1024,11 @@ DEPENDENCIES
concurrent-ruby (~> 1.0.5)
concurrent-ruby (~> 1.0.5)
connection_pool (~> 2.0)
connection_pool (~> 2.0)
creole (~> 0.5.0)
creole (~> 0.5.0)
d3_rails (~> 3.5.0)
database_cleaner (~> 1.5.0)
database_cleaner (~> 1.5.0)
deckar01-task_list (= 2.0.0)
deckar01-task_list (= 2.0.0)
default_value_for (~> 3.0.5)
default_value_for (~> 3.0.5)
device_detector
device_detector
devise (~> 4.
2
)
devise (~> 4.
4
)
devise-two-factor (~> 3.0.0)
devise-two-factor (~> 3.0.0)
diffy (~> 3.1.0)
diffy (~> 3.1.0)
doorkeeper (~> 4.3)
doorkeeper (~> 4.3)
...
@@ -1063,7 +1059,7 @@ DEPENDENCIES
...
@@ -1063,7 +1059,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 0.9
7
.0)
gitaly-proto (~> 0.9
9
.0)
github-linguist (~> 5.3.3)
github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2)
gitlab-gollum-lib (~> 4.2)
...
@@ -1071,12 +1067,12 @@ DEPENDENCIES
...
@@ -1071,12 +1067,12 @@ DEPENDENCIES
gitlab-markup (~> 1.6.2)
gitlab-markup (~> 1.6.2)
gitlab-styles (~> 2.3)
gitlab-styles (~> 2.3)
gitlab_omniauth-ldap (~> 2.0.4)
gitlab_omniauth-ldap (~> 2.0.4)
gon (~> 6.
1.0
)
gon (~> 6.
2
)
google-api-client (~> 0.19.8)
google-api-client (~> 0.19.8)
google-protobuf (= 3.5.1)
google-protobuf (= 3.5.1)
gpgme
gpgme
grape (~> 1.0)
grape (~> 1.0)
grape-entity (~> 0.
6.0
)
grape-entity (~> 0.
7.1
)
grape-route-helpers (~> 2.1.0)
grape-route-helpers (~> 2.1.0)
grape_logging (~> 1.7)
grape_logging (~> 1.7)
grpc (~> 1.11.0)
grpc (~> 1.11.0)
...
@@ -1117,7 +1113,7 @@ DEPENDENCIES
...
@@ -1117,7 +1113,7 @@ DEPENDENCIES
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
omniauth-cas3 (~> 1.1.4)
omniauth-facebook (~> 4.0.0)
omniauth-facebook (~> 4.0.0)
omniauth-github (~> 1.
1.1
)
omniauth-github (~> 1.
3
)
omniauth-gitlab (~> 1.0.2)
omniauth-gitlab (~> 1.0.2)
omniauth-google-oauth2 (~> 0.5.3)
omniauth-google-oauth2 (~> 0.5.3)
omniauth-kerberos (~> 0.3.0)
omniauth-kerberos (~> 0.3.0)
...
@@ -1136,14 +1132,14 @@ DEPENDENCIES
...
@@ -1136,14 +1132,14 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3)
peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
pg (~> 0.18.2)
premailer-rails (~> 1.9.7)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.
1
)
prometheus-client-mmap (~> 0.9.
2
)
pry-byebug (~> 3.4.1)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
rack-attack (~> 4.4.1)
rack-cors (~> 1.0.0)
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
rack-proxy (~> 0.6.0)
rails (= 5.0.
6
)
rails (= 5.0.
7
)
rails-controller-testing
rails-controller-testing
rails-deprecated_sanitizer (~> 1.0.3)
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)
rails-i18n (~> 5.1)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment