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
3fb437a7
Commit
3fb437a7
authored
Mar 18, 2021
by
yo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move from btn-success to btn-confirm in projects directory
parent
fbc56222
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
8 deletions
+8
-8
app/views/projects/_commit_button.html.haml
app/views/projects/_commit_button.html.haml
+1
-1
app/views/projects/_customize_workflow.html.haml
app/views/projects/_customize_workflow.html.haml
+1
-1
app/views/projects/_fork_suggestion.html.haml
app/views/projects/_fork_suggestion.html.haml
+1
-1
app/views/projects/_invite_members.html.haml
app/views/projects/_invite_members.html.haml
+1
-1
app/views/projects/_new_project_fields.html.haml
app/views/projects/_new_project_fields.html.haml
+1
-1
app/views/projects/_readme.html.haml
app/views/projects/_readme.html.haml
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+2
-2
No files found.
app/views/projects/_commit_button.html.haml
View file @
3fb437a7
.form-actions
=
button_tag
'Commit changes'
,
id:
'commit-changes'
,
class:
'gl-button btn btn-
success
js-commit-button qa-commit-button'
=
button_tag
'Commit changes'
,
id:
'commit-changes'
,
class:
'gl-button btn btn-
confirm
js-commit-button qa-commit-button'
=
link_to
'Cancel'
,
cancel_path
,
class:
'gl-button btn btn-default btn-cancel'
,
data:
{
confirm:
leave_edit_message
}
...
...
app/views/projects/_customize_workflow.html.haml
View file @
3fb437a7
...
...
@@ -5,4 +5,4 @@
%p
Get started with GitLab by enabling features that work best for your project. From issues and wikis, to merge requests and pipelines, GitLab can help manage your workflow from idea to production!
-
if
can?
(
current_user
,
:admin_project
,
@project
)
=
link_to
"Get started"
,
edit_project_path
(
@project
),
class:
"gl-button btn btn-
success
"
=
link_to
"Get started"
,
edit_project_path
(
@project
),
class:
"gl-button btn btn-
confirm
"
app/views/projects/_fork_suggestion.html.haml
View file @
3fb437a7
...
...
@@ -5,6 +5,6 @@
edit
files in this project directly. Please fork this project,
make your changes there, and submit a merge request.
=
link_to
'Fork'
,
nil
,
method: :post
,
class:
'js-fork-suggestion-button gl-button btn btn-grouped btn-
inverted btn-success
'
=
link_to
'Fork'
,
nil
,
method: :post
,
class:
'js-fork-suggestion-button gl-button btn btn-grouped btn-
confirm-secondary
'
%button
.js-cancel-fork-suggestion-button.gl-button.btn.btn-grouped
{
type:
'button'
}
Cancel
app/views/projects/_invite_members.html.haml
View file @
3fb437a7
...
...
@@ -4,5 +4,5 @@
=
s_
(
'InviteMember|Invite your team'
)
%p
=
s_
(
'InviteMember|Add members to this project and start collaborating with your team.'
)
=
link_to
s_
(
'InviteMember|Invite members'
),
project_project_members_path
(
@project
,
sort: :access_level_desc
),
class:
'gl-button btn btn-
success
gl-mb-8 gl-xs-w-full'
,
class:
'gl-button btn btn-
confirm
gl-mb-8 gl-xs-w-full'
,
data:
{
track_event:
'click_button'
,
track_label:
'invite_members_empty_project'
}
app/views/projects/_new_project_fields.html.haml
View file @
3fb437a7
...
...
@@ -62,5 +62,5 @@
.option-description
=
s_
(
'ProjectsNew|Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository.'
)
=
f
.
submit
_
(
'Create project'
),
class:
"btn gl-button btn-
success
"
,
data:
{
track_label:
"
#{
track_label
}
"
,
track_event:
"click_button"
,
track_property:
"create_project"
,
track_value:
""
}
=
f
.
submit
_
(
'Create project'
),
class:
"btn gl-button btn-
confirm
"
,
data:
{
track_label:
"
#{
track_label
}
"
,
track_event:
"click_button"
,
track_property:
"create_project"
,
track_value:
""
}
=
link_to
_
(
'Cancel'
),
dashboard_projects_path
,
class:
'btn gl-button btn-default btn-cancel'
,
data:
{
track_label:
"
#{
track_label
}
"
,
track_event:
"click_button"
,
track_property:
"cancel"
,
track_value:
""
}
app/views/projects/_readme.html.haml
View file @
3fb437a7
...
...
@@ -24,4 +24,4 @@
distributed with computer software, forming part of its documentation.
GitLab will render it here instead of this message.
%p
=
link_to
"Add Readme"
,
@project
.
add_readme_path
,
class:
'
btn btn-success
'
=
link_to
"Add Readme"
,
@project
.
add_readme_path
,
class:
'
gl-button btn btn-confirm
'
app/views/projects/edit.html.haml
View file @
3fb437a7
...
...
@@ -23,7 +23,7 @@
.js-project-permissions-form
-
if
show_visibility_confirm_modal?
(
@project
)
=
render
"visibility_modal"
=
f
.
submit
_
(
'Save changes'
),
class:
"btn gl-button btn-
success
#{
(
'js-confirm-danger'
if
show_visibility_confirm_modal?
(
@project
))
}
"
,
data:
{
qa_selector:
'visibility_features_permissions_save_button'
,
check_field_name:
(
"project[visibility_level]"
if
show_visibility_confirm_modal?
(
@project
)),
check_compare_value:
@project
.
visibility_level
}
=
f
.
submit
_
(
'Save changes'
),
class:
"btn gl-button btn-
confirm
#{
(
'js-confirm-danger'
if
show_visibility_confirm_modal?
(
@project
))
}
"
,
data:
{
qa_selector:
'visibility_features_permissions_save_button'
,
check_field_name:
(
"project[visibility_level]"
if
show_visibility_confirm_modal?
(
@project
)),
check_compare_value:
@project
.
visibility_level
}
%section
.rspec-merge-request-settings.settings.merge-requests-feature.no-animate
#js-merge-request-settings
{
class:
[(
'expanded'
if
expanded
),
(
'hidden'
if
@project
.
project_feature
.
send
(
:merge_requests_access_level
)
==
0
)],
data:
{
qa_selector:
'merge_request_settings_content'
}
}
.settings-header
...
...
@@ -37,7 +37,7 @@
=
form_for
@project
,
html:
{
multipart:
true
,
class:
"merge-request-settings-form js-mr-settings-form"
},
authenticity_token:
true
do
|
f
|
%input
{
name:
'update_section'
,
type:
'hidden'
,
value:
'js-merge-request-settings'
}
=
render
'projects/merge_request_settings'
,
form:
f
=
f
.
submit
_
(
'Save changes'
),
class:
"btn gl-button btn-
success
rspec-save-merge-request-changes"
,
data:
{
qa_selector:
'save_merge_request_changes_button'
}
=
f
.
submit
_
(
'Save changes'
),
class:
"btn gl-button btn-
confirm
rspec-save-merge-request-changes"
,
data:
{
qa_selector:
'save_merge_request_changes_button'
}
=
render_if_exists
'projects/merge_request_approvals_settings'
,
expanded:
expanded
...
...
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