Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gitlab
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Ruby Team
gitlab
Commits
f6c9df2d
Commit
f6c9df2d
authored
5 years ago
by
Praveen Arimbrathodiyil
Browse files
Options
Downloads
Patches
Plain Diff
Refresh patches with fuzz
parent
1393660c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/patches/0100-remove-development-test.patch
+3
-3
3 additions, 3 deletions
debian/patches/0100-remove-development-test.patch
debian/patches/0680-rails-5_2.patch
+7
-7
7 additions, 7 deletions
debian/patches/0680-rails-5_2.patch
with
10 additions
and
10 deletions
debian/patches/0100-remove-development-test.patch
+
3
−
3
View file @
f6c9df2d
...
...
@@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -28
3
,7 +28
3
,6 @@
@@ -28
2
,7 +28
2
,6 @@
gem 'rails-i18n', '~> 5.1'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
...
...
@@ -10,8 +10,8 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.2', '>= 1.2.2'
@@ -30
5
,21 +30
4
,6 @@
gem '
raindrops
', '~> 0.1
8
'
@@ -3
1
0,21 +30
9
,6 @@
gem '
jaeger-client
', '~> 0.1
0.0
'
end
-group :development do
...
...
This diff is collapsed.
Click to expand it.
debian/patches/0680-rails-5_2.patch
+
7
−
7
View file @
f6c9df2d
...
...
@@ -32,15 +32,15 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
asana (0.8.1)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
@@ -18
3
,7 +18
3
,6 @@
@@ -18
4
,7 +18
4
,6 @@
encryptor (3.0.0)
equalizer (0.0.11)
erubi (1.7.1)
- erubis (2.7.0)
escape_utils (1.2.1)
et-orbi (1.
0.3
)
et-orbi (1.
1.7
)
tzinfo
@@ -25
3
,8 +25
2
,8 @@
@@ -25
4
,8 +25
3
,8 @@
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
...
...
@@ -51,7 +51,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
@@ -3
26
,8 +32
5
,8 @@
@@ -3
30
,8 +32
9
,8 @@
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
...
...
@@ -62,7 +62,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
grape (~> 1.0)
rake (~> 12)
grape_logging (1.7.0)
@@ -9
2
3,7 +9
22
,7 @@
@@ -93
4
,7 +9
33
,7 @@
hashdiff
webpack-rails (0.9.11)
railties (>= 3.2.0)
...
...
@@ -71,7 +71,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
wikicloth (0.8.1)
@@ -10
21
,7 +102
0
,7 @@
@@ -10
33
,7 +10
3
2,7 @@
gpgme (~> 2.0.18)
grape (~> 1.1.0)
grape-entity (~> 0.7.1)
...
...
@@ -150,7 +150,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
metadata: :gzip,
trace: :raw,
junit: :gzip,
@@ -9
1
,7 +9
1
,7 @@
@@ -9
3
,7 +9
3
,7 @@
enum file_format: {
raw: 1,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment