diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-19 09:57:43 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-19 09:57:43 +0100 |
| commit | 836fddd0da9fb1a40e25d96b1c6ff1a36dde8e55 (patch) | |
| tree | 8f5c6a345a7555f793dbf5f699d21c6f66e34e96 /spec/controllers | |
| parent | bd6cbf9145567298fb64442ffc3abf5746ba9a9c (diff) | |
| parent | bbd83376d625b8d9cb73cbc83c3c0eb71b1abf32 (diff) | |
| download | gitlab-ce-vue-pipelines.tar.gz | |
Merge branch 'master' into vue-pipelinesvue-pipelines
* master: (23 commits)
Fix container registry navigation menu highlights
Resolve "Mini pipeline graph + status badge, when updating in real time don't change color and svg icon"
Refactor group search out of global search
disables test settings on chat notification services when repository is empty
Disable initialization table pipeline for new merge request form
Improves support for long build traces:
Review changes, used eq instead of match
Remove lighten blue and add blue-25 for background
Fixed tests
29595 Customize experience callout design
Remove unneeded format block
Fixed tests
29595 Customize experience callout design
Remove issue boards from recent searches
Updated specs
Remove helper
[ci skip] Use favicon full path
Update phrasing via @jschatz1 comments
Change heading
Update index.md
...
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/builds_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/pipelines_controller_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/builds_controller_spec.rb b/spec/controllers/projects/builds_controller_spec.rb index 13208d21918..faf3770f5e9 100644 --- a/spec/controllers/projects/builds_controller_spec.rb +++ b/spec/controllers/projects/builds_controller_spec.rb @@ -60,7 +60,7 @@ describe Projects::BuildsController do expect(json_response['text']).to eq status.text expect(json_response['label']).to eq status.label expect(json_response['icon']).to eq status.icon - expect(json_response['favicon']).to eq status.favicon + expect(json_response['favicon']).to eq "/assets/ci_favicons/#{status.favicon}.ico" end end end diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 1739d40ab88..cc393bd24f2 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1208,7 +1208,7 @@ describe Projects::MergeRequestsController do expect(json_response['text']).to eq status.text expect(json_response['label']).to eq status.label expect(json_response['icon']).to eq status.icon - expect(json_response['favicon']).to eq status.favicon + expect(json_response['favicon']).to eq "/assets/ci_favicons/#{status.favicon}.ico" end end diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index d8f9bfd0d37..d9192177a06 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -86,7 +86,7 @@ describe Projects::PipelinesController do expect(json_response['text']).to eq status.text expect(json_response['label']).to eq status.label expect(json_response['icon']).to eq status.icon - expect(json_response['favicon']).to eq status.favicon + expect(json_response['favicon']).to eq "/assets/ci_favicons/#{status.favicon}.ico" end end end |