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
80a7aa99
Commit
80a7aa99
authored
5 years ago
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove further instances of st_diffs
parent
a6891eb8
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
14 deletions
+0
-14
db/migrate/limits_to_mysql.rb
db/migrate/limits_to_mysql.rb
+0
-13
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+0
-1
No files found.
db/migrate/limits_to_mysql.rb
View file @
80a7aa99
...
...
@@ -2,19 +2,6 @@ class LimitsToMysql < ActiveRecord::Migration[4.2]
def
up
return
unless
ActiveRecord
::
Base
.
configurations
[
Rails
.
env
][
'adapter'
]
=~
/^mysql/
# These columns were removed in 10.3, but this is called from two places:
# 1. A migration run after they were added, but before they were removed.
# 2. A rake task which can be run at any time.
#
# Because of item 2, we need these checks.
if
column_exists?
(
:merge_request_diffs
,
:st_commits
)
change_column
:merge_request_diffs
,
:st_commits
,
:text
,
limit:
2147483647
end
if
column_exists?
(
:merge_request_diffs
,
:st_diffs
)
change_column
:merge_request_diffs
,
:st_diffs
,
:text
,
limit:
2147483647
end
change_column
:snippets
,
:content
,
:text
,
limit:
2147483647
change_column
:notes
,
:st_diff
,
:text
,
limit:
2147483647
end
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/import_export/import_export.yml
View file @
80a7aa99
...
...
@@ -133,7 +133,6 @@ excluded_attributes:
-
:external_diff
-
:stored_externally
-
:external_diff_store
-
:st_diffs
merge_request_diff_files
:
-
:diff
-
:external_diff_offset
...
...
This diff is collapsed.
Click to expand it.
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