diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-14 16:37:05 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-14 16:37:05 +0300 |
| commit | 7217a19e729534a122c0c4a0c842080cfcbd3330 (patch) | |
| tree | 0f8bbe9d3713fb4a439b5634b46a11738946ff9f /app/assets/stylesheets/framework/variables.scss | |
| parent | 92b0f54ea222ce4c4437a50683c972bacc1fee06 (diff) | |
| parent | 3e90aa1119fc4c77e92e6492f1906f252d90b64e (diff) | |
Merge branch 'master' into 22604-manual-actions
* master: (151 commits)
Improve build status specs contexts descriptions
Add some missing tests for detailed status methods
Fix wrong error message expectation in API::Commits spec
Remove trailing blank line from Allowable module
Move admin settings spinach feature to rspec
Encode when migrating ProcessCommitWorker jobs
Prevent overflow with vertical scroll when we have space to show content
Make rubocop happy
API: Ability to cherry-pick a commit
Be smarter when finding a sudoed user in API::Helpers
Update manual build icon SVG
Make it possible to mix `Gitlab::Routing` in
Backport hooks on group policies for the EE-specific implementation
Extract abilities checking module from ability model
Extend tests for pipeline detailed status helpers
Add tests for common build detailed status helpers
Add missing tests for build `cancelable?` method
Add tests for detailed build statuses factory
Make it possible to retry build that was canceled
Make build retryable only if complete and executed
...
Conflicts:
app/assets/stylesheets/pages/pipelines.scss
app/models/ci/build.rb
app/models/ci/pipeline.rb
app/models/ci/stage.rb
app/models/commit_status.rb
app/views/admin/runners/show.html.haml
app/views/projects/builds/_header.html.haml
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
app/views/projects/pipelines/_info.html.haml
lib/gitlab/ci/status/build/common.rb
lib/gitlab/ci/status/build/play.rb
lib/gitlab/ci/status/build/stop.rb
lib/gitlab/ci/status/core.rb
spec/lib/gitlab/ci/status/pipeline/common_spec.rb
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index cfb2ed9321b..03fbfa5f1bd 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -486,6 +486,7 @@ $jq-ui-default-color: #777; $label-gray-bg: #f8fafc; $label-inverse-bg: #333; $label-remove-border: rgba(0, 0, 0, .1); +$label-border-radius: 14px; /* * Lint |