Commit 05323a78 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'project-settings' into 'master'

Project settings UI update

![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png)

See merge request !4162
parents c00ba9a6 10e3de7a
...@@ -134,14 +134,6 @@ ...@@ -134,14 +134,6 @@
} }
} }
.change-username-title {
color: $gl-warning;
}
.remove-account-title {
color: $gl-danger;
}
.provider-btn-group { .provider-btn-group {
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
margin-bottom: 0; margin-bottom: 0;
} }
.new_project, .new_project,
.edit_project { .edit-project {
fieldset.features { fieldset.features {
.control-label { .control-label {
font-weight: normal; font-weight: normal;
......
...@@ -12,3 +12,11 @@ ...@@ -12,3 +12,11 @@
border: 1px solid $warning-message-border; border: 1px solid $warning-message-border;
border-radius: $border-radius-base; border-radius: $border-radius-base;
} }
.warning-title {
color: $gl-warning;
}
.danger-title {
color: $gl-danger;
}
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
- if current_user.can_change_username? - if current_user.can_change_username?
.row.prepend-top-default .row.prepend-top-default
.col-lg-3.profile-settings-sidebar .col-lg-3.profile-settings-sidebar
%h4.prepend-top-0.change-username-title %h4.prepend-top-0.warning-title
Change username Change username
%p %p
Changing your username will change path to all personal projects! Changing your username will change path to all personal projects!
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
- if signup_enabled? - if signup_enabled?
.row.prepend-top-default .row.prepend-top-default
.col-lg-3.profile-settings-sidebar .col-lg-3.profile-settings-sidebar
%h4.prepend-top-0.remove-account-title %h4.prepend-top-0.danger-title
Remove account Remove account
.col-lg-9 .col-lg-9
- if @user.can_be_removed? - if @user.can_be_removed?
......
%fieldset.builds-feature %fieldset.builds-feature
%legend %h5.prepend-top-0
Builds: Builds
- unless @repository.gitlab_ci_yml - unless @repository.gitlab_ci_yml
.form-group .form-group
.col-sm-offset-2.col-sm-10 %p Builds need to be configured before you can begin using Continuous Integration.
%p Builds need to be configured before you can begin using Continuous Integration. = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
= link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
%hr
.form-group .form-group
.col-sm-offset-2.col-sm-10 %p Get recent application code using the following command:
%p Get recent application code using the following command: .radio
.radio = f.label :build_allow_git_fetch_false do
= f.label :build_allow_git_fetch_false do = f.radio_button :build_allow_git_fetch, 'false'
= f.radio_button :build_allow_git_fetch, 'false' %strong git clone
%strong git clone %br
%br %span.descr Slower but makes sure you have a clean dir before every build
%span.descr Slower but makes sure you have a clean dir before every build .radio
.radio = f.label :build_allow_git_fetch_true do
= f.label :build_allow_git_fetch_true do = f.radio_button :build_allow_git_fetch, 'true'
= f.radio_button :build_allow_git_fetch, 'true' %strong git fetch
%strong git fetch %br
%br %span.descr Faster
%span.descr Faster
.form-group .form-group
= f.label :build_timeout_in_minutes, 'Timeout', class: 'control-label' = f.label :build_timeout_in_minutes, 'Timeout', class: 'label-light'
.col-sm-10 = f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0'
= f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0' %p.help-block per build in minutes
%p.help-block per build in minutes
.form-group .form-group
= f.label :build_coverage_regex, "Test coverage parsing", class: 'control-label' = f.label :build_coverage_regex, "Test coverage parsing", class: 'label-light'
.col-sm-10 .input-group
.input-group %span.input-group-addon /
%span.input-group-addon / = f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
= f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered' %span.input-group-addon /
%span.input-group-addon / %p.help-block
%p.help-block We will use this regular expression to find test coverage output in build trace.
We will use this regular expression to find test coverage output in build trace. Leave blank if you want to disable this feature
Leave blank if you want to disable this feature .bs-callout.bs-callout-info
.bs-callout.bs-callout-info %p Below are examples of regex for existing tools:
%p Below are examples of regex for existing tools: %ul
%ul %li
%li Simplecov (Ruby) -
Simplecov (Ruby) - %code \(\d+.\d+\%\) covered
%code \(\d+.\d+\%\) covered %li
%li pytest-cov (Python) -
pytest-cov (Python) - %code \d+\%\s*$
%code \d+\%\s*$ %li
%li phpunit --coverage-text --colors=never (PHP) -
phpunit --coverage-text --colors=never (PHP) - %code ^\s*Lines:\s*\d+.\d+\%
%code ^\s*Lines:\s*\d+.\d+\% %li
%li gcovr (C/C++) -
gcovr (C/C++) - %code ^TOTAL.*\s+(\d+\%)$
%code ^TOTAL.*\s+(\d+\%)$ %li
%li tap --coverage-report=text-summary (Node.js) -
tap --coverage-report=text-summary (Node.js) - %code ^Statements\s*:\s*([^%]+)
%code ^Statements\s*:\s*([^%]+)
.form-group .form-group
.col-sm-offset-2.col-sm-10 .checkbox
.checkbox = f.label :public_builds do
= f.label :public_builds do = f.check_box :public_builds
= f.check_box :public_builds %strong Public builds
%strong Public builds .help-block Allow everyone to access builds for Public and Internal projects
.help-block Allow everyone to access builds for Public and Internal projects
.form-group .form-group.append-bottom-0
= f.label :runners_token, "Runners token", class: 'control-label' = f.label :runners_token, "Runners token", class: 'label-light'
.col-sm-10 = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
= f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89' %p.help-block The secure token used to checkout project.
%p.help-block The secure token used to checkout project.
This diff is collapsed.
...@@ -95,7 +95,7 @@ module SharedProject ...@@ -95,7 +95,7 @@ module SharedProject
step 'I should see project settings' do step 'I should see project settings' do
expect(current_path).to eq edit_namespace_project_path(@project.namespace, @project) expect(current_path).to eq edit_namespace_project_path(@project.namespace, @project)
expect(page).to have_content("Project name") expect(page).to have_content("Project name")
expect(page).to have_content("Features:") expect(page).to have_content("Features")
end end
def current_project def current_project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment