diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 17:39:07 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 17:39:07 +0000 |
| commit | 487667e6a58976122f3bbbf0dfad2e210fccd38c (patch) | |
| tree | ad4a994bce164c3962b526139077eba967a5d2ba /app | |
| parent | ed4b3a829a550e04ee76f894a3d7f4cfd209f683 (diff) | |
| parent | 01c2a50fa2cfb09996bf5ce1cfe7cc319df68ee3 (diff) | |
| download | gitlab-ce-487667e6a58976122f3bbbf0dfad2e210fccd38c.tar.gz | |
Merge branch 'master' into 27932-merge-request-pipelines-displays-json
* master:
rspec_profiling: Discover the correct branch name in GitLab CI
Updated protected branches dropdown image in docs
Fix admin_labels_spec.rb transient failure
Make sure our current .gitlab-ci.yml is valid
Show Pipeline(not Job) in MR desktop notification
Make min width smaller for user settings
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_show.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 2a01bc4d44d..731ce57c245 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -272,7 +272,7 @@ header { .header-user { .dropdown-menu-nav { - width: 140px; + min-width: 140px; margin-top: -5px; } } diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index 5de59473840..4c063747857 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -16,13 +16,13 @@ gitlab_icon: "#{asset_path 'gitlab_logo.png'}", ci_status: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.status : ''}", ci_message: { - normal: "Job {{status}} for \"{{title}}\"", + normal: "Pipeline {{status}} for \"{{title}}\"", preparing: "{{status}} job for \"{{title}}\"" }, ci_enable: #{@project.ci_service ? "true" : "false"}, ci_title: { preparing: "{{status}} job", - normal: "Job {{status}}" + normal: "Pipeline {{status}}" }, ci_sha: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.short_sha : ''}", ci_pipeline: #{@merge_request.head_pipeline.try(:id).to_json}, |