Commit 86726662e7b976dd54d02fb8d4f2e590efc3d7b8
Exists in
spb-stable
and in
2 other branches
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
app/views/admin/broadcast_messages/index.html.haml
@@ -22,12 +22,12 @@ | @@ -22,12 +22,12 @@ | ||
22 | = f.label :color, "Background Color", class: 'control-label' | 22 | = f.label :color, "Background Color", class: 'control-label' |
23 | .col-sm-10 | 23 | .col-sm-10 |
24 | = f.text_field :color, placeholder: "#AA33EE", class: "form-control" | 24 | = f.text_field :color, placeholder: "#AA33EE", class: "form-control" |
25 | - .light Hex values as 3 double digit numbers, starting with a # sign. | 25 | + .light 6 character hex values starting with a # sign. |
26 | .form-group.js-toggle-colors-container.hide | 26 | .form-group.js-toggle-colors-container.hide |
27 | = f.label :font, "Font Color", class: 'control-label' | 27 | = f.label :font, "Font Color", class: 'control-label' |
28 | .col-sm-10 | 28 | .col-sm-10 |
29 | = f.text_field :font, placeholder: "#224466", class: "form-control" | 29 | = f.text_field :font, placeholder: "#224466", class: "form-control" |
30 | - .light Hex values as 3 double digit numbers, starting with a # sign. | 30 | + .light 6 character hex values starting with a # sign. |
31 | .form-group | 31 | .form-group |
32 | = f.label :starts_at, class: 'control-label' | 32 | = f.label :starts_at, class: 'control-label' |
33 | .col-sm-10.datetime-controls | 33 | .col-sm-10.datetime-controls |
app/views/notify/repository_push_email.text.haml
@@ -17,7 +17,7 @@ Changes: | @@ -17,7 +17,7 @@ Changes: | ||
17 | - else | 17 | - else |
18 | = diff.new_path || diff.old_path | 18 | = diff.new_path || diff.old_path |
19 | \===================================== | 19 | \===================================== |
20 | - = diff.diff | 20 | + != diff.diff |
21 | \ | 21 | \ |
22 | - if @compare.timeout | 22 | - if @compare.timeout |
23 | Huge diff. To prevent performance issues it was hidden | 23 | Huge diff. To prevent performance issues it was hidden |