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
df179a2d
Commit
df179a2d
authored
Mar 23, 2018
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict in `safe_model_attributes.yml`
[skip ci]
parent
91112906
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+0
-3
No files found.
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
df179a2d
...
...
@@ -474,12 +474,9 @@ Project:
-
merge_requests_ff_only_enabled
-
merge_requests_rebase_enabled
-
jobs_cache_index
<<<<<<< HEAD
-
external_authorization_classification_label
-
external_webhook_token
=======
-
pages_https_only
>
>>>>>>
upstream/master
Author
:
-
name
ProjectFeature
:
...
...
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