diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-04 04:25:07 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-04 04:25:07 +0000 |
| commit | a8b4756f2925da0e5ca599a8469fe47445c95425 (patch) | |
| tree | 8b28c3ba5c3a0f45895a284d8be110b918bd7ff8 /spec/models | |
| parent | 0bcd5ca4ebfe4901aab8a74f58d0599883f709bd (diff) | |
| parent | 490cf7bfcefdb2e275c537699717c12e440f57ec (diff) | |
| download | gitlab-ce-a8b4756f2925da0e5ca599a8469fe47445c95425.tar.gz | |
Merge branch 'mwessel/gitlab-ce-configure-protection' into 'master'
Mwessel/gitlab ce configure protection
See merge request !1467
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/application_setting_spec.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb index 1723eba9ec3..cd6d03e6c1a 100644 --- a/spec/models/application_setting_spec.rb +++ b/spec/models/application_setting_spec.rb @@ -2,15 +2,16 @@ # # Table name: application_settings # -# id :integer not null, primary key -# default_projects_limit :integer -# signup_enabled :boolean -# signin_enabled :boolean -# gravatar_enabled :boolean -# sign_in_text :text -# created_at :datetime -# updated_at :datetime -# home_page_url :string(255) +# id :integer not null, primary key +# default_projects_limit :integer +# default_branch_protection :integer +# signup_enabled :boolean +# signin_enabled :boolean +# gravatar_enabled :boolean +# sign_in_text :text +# created_at :datetime +# updated_at :datetime +# home_page_url :string(255) # require 'spec_helper' |