diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-02-29 13:18:29 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-02-29 13:18:29 +0000 |
commit | 2ea8f71bb42e63caf58ab285d0c4e483c2c4de19 (patch) | |
tree | 3ecbb3e93baa7b46864348bab306003e831f194f /spec | |
parent | a297e4404855bc79c53d5c1ca4df023a238c1798 (diff) | |
parent | 9a2869ab4674b8a6b94ec206660e083a00d4db37 (diff) | |
download | gitlab-ce-2ea8f71bb42e63caf58ab285d0c4e483c2c4de19.tar.gz |
Merge branch '11489-branded-appearance-to-ce' into 'master'
Branded appearance to CE
Closes #11489
The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.
TODO:
- [x] Copy docs
- [x] Make new screenshots
- [ ] Remove Custom Welcome message feature?
@rymai: I was unsure what labels to add to ping you, so I just ping you like this :wink:
/cc @DouweM
See merge request !2927
Diffstat (limited to 'spec')
-rw-r--r-- | spec/factories/appearances.rb | 8 | ||||
-rw-r--r-- | spec/models/appearance_spec.rb | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/spec/factories/appearances.rb b/spec/factories/appearances.rb new file mode 100644 index 00000000000..cf2a2b76bcb --- /dev/null +++ b/spec/factories/appearances.rb @@ -0,0 +1,8 @@ +# Read about factories at https://github.com/thoughtbot/factory_girl + +FactoryGirl.define do + factory :appearance do + title "MepMep" + description "This is my Community Edition instance" + end +end diff --git a/spec/models/appearance_spec.rb b/spec/models/appearance_spec.rb new file mode 100644 index 00000000000..c5658bd26e1 --- /dev/null +++ b/spec/models/appearance_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe Appearance, type: :model do + subject { create(:appearance) } + + it { is_expected.to be_valid } + + it { is_expected.to validate_presence_of(:title) } + it { is_expected.to validate_presence_of(:description) } +end |