diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 6 | ||||
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/broadcast_message.rb | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index c1eaae82e5e..5bff00f376e 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -21,13 +21,15 @@ .merge-request .merge-request-tabs{ border-bottom: 2px solid $border_primary; - padding-bottom: 10px; margin-bottom: 20px; li { a { - padding: 20px 40px; + padding: 18px 40px; font-size: 14px; + margin-bottom: -2px; + border-bottom: 2px solid $border_primary; + @include border-radius(0px); } } } diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index b037cf56502..30fcb64cbb2 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -16,6 +16,8 @@ class Projects::LabelsController < Projects::ApplicationController redirect_to project_issues_path(@project) elsif params[:redirect] == 'merge_requests' redirect_to project_merge_requests_path(@project) + else + redirect_to project_labels_path(@project) end end diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb index 85ab7ed6ae8..ce8b7973cd9 100644 --- a/app/models/broadcast_message.rb +++ b/app/models/broadcast_message.rb @@ -20,8 +20,8 @@ class BroadcastMessage < ActiveRecord::Base validates :starts_at, presence: true validates :ends_at, presence: true - validates :color, format: { with: /\A\#[0-9A-Fa-f]{6}+\Z/ }, allow_blank: true - validates :font, format: { with: /\A\#[0-9A-Fa-f]{6}+\Z/ }, allow_blank: true + validates :color, format: { with: /\A\#[0-9A-Fa-f]{3}{1,2}+\Z/ }, allow_blank: true + validates :font, format: { with: /\A\#[0-9A-Fa-f]{3}{1,2}+\Z/ }, allow_blank: true def self.current where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last |