diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-03 12:41:16 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-03 12:41:16 +0100 |
| commit | e80c79e3ad0efe505541ebac0b149b750cd1cc60 (patch) | |
| tree | 42f16121a216990fecb5f30eea76a992929bac57 | |
| parent | 8670411ae7acb93b5113634a3ae5e476ef6d2aee (diff) | |
| download | gitlab-ce-e80c79e3ad0efe505541ebac0b149b750cd1cc60.tar.gz | |
Fix build errors
| -rw-r--r-- | app/models/ability.rb | 6 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 313c6f049b7..a9246dd3dd5 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -57,7 +57,7 @@ class Ability ] if project.allow_guest_to_access_builds? - rules += :read_build + rules << :read_build end rules - project_disabled_features_rules(project) @@ -115,7 +115,7 @@ class Ability rules.push(*project_guest_rules) if project.allow_guest_to_access_builds? - rules += :read_build + rules << :read_build end end @@ -123,7 +123,7 @@ class Ability rules.push(*public_project_rules) if project.allow_guest_to_access_builds? - rules += :read_build + rules << :read_build end end diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index e3165caad05..fd61ce6a99a 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -130,6 +130,7 @@ %strong git fetch %br %span.descr Faster + .form-group = f.label :build_timeout_in_minutes, 'Timeout', class: 'control-label' .col-sm-10 @@ -157,12 +158,15 @@ %li phpunit --coverage-text --colors=never (PHP) - %code ^\s*Lines:\s*\d+.\d+\% + .form-group .col-sm-offset-2.col-sm-10 .checkbox = f.label :allow_guest_to_access_builds do = f.check_box :allow_guest_to_access_builds - Allow guest to access builds (including build logs and artifacts) + %strong Guests can see builds + .help-block Allow guests and anonymous users to access builds including build trace and artifacts + %fieldset.features %legend Advanced settings |