Commit 3a78f7ca authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'issue_12658' into 'master' 

Add group visibility level

Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3051

Closes #12658

See merge request !3323
parents 0305dd98 503244eb

Gemfile.lock

+0 −3
Original line number Original line Diff line number Diff line
@@ -1064,6 +1064,3 @@ DEPENDENCIES 
  web-console (~> 2.0)

  web-console (~> 2.0)

  webmock (~> 1.21.0)

  webmock (~> 1.21.0)

  wikicloth (= 0.8.1)
 
  wikicloth (= 0.8.1)
 


BUNDLED WITH

   1.11.2

app/assets/stylesheets/framework/blocks.scss

+18 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,24 @@ 
    color: #4c4e54;

    color: #4c4e54;

    font-size: 23px;

    font-size: 23px;

    line-height: 1.1;

    line-height: 1.1;



    h1 {

      color: #313236;

      margin-bottom: 6px;

      font-size: 23px;

    }



    .visibility-icon {

      display: inline-block;

      margin-left: 5px;

      font-size: 18px;

      color: $gray;

    }



    p {

      padding: 0 $gl-padding;

      color: #5c5d5e;

    }

  }

  }





  .cover-desc {

  .cover-desc {

app/assets/stylesheets/pages/projects.scss

+0 −22
Original line number Original line Diff line number Diff line
@@ -68,28 +68,6 @@ 
    }

    }

  }

  }





  .project-home-desc {

    h1 {

      color: #313236;

      margin: 0;

      margin-bottom: 6px;

      font-size: 23px;

      font-weight: normal;

    }



    .visibility-icon {

      display: inline-block;

      margin-left: 5px;

      font-size: 18px;

      color: $gray;

    }



    p {

      padding: 0 $gl-padding;

      color: #5c5d5e;

    }

  }



  .project-repo-buttons {

  .project-repo-buttons {

    margin-top: 20px;

    margin-top: 20px;

    margin-bottom: 0;

    margin-bottom: 0;

app/controllers/admin/application_settings_controller.rb

+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ def application_setting_params 
      :session_expire_delay,

      :session_expire_delay,

      :default_project_visibility,

      :default_project_visibility,

      :default_snippet_visibility,

      :default_snippet_visibility,

      :default_group_visibility,

      :restricted_signup_domains_raw,

      :restricted_signup_domains_raw,

      :version_check_enabled,

      :version_check_enabled,

      :admin_notification_email,

      :admin_notification_email,

app/controllers/admin/groups_controller.rb

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,6 +59,6 @@ def group 
  end

  end





  def group_params

  def group_params

    params.require(:group).permit(:name, :description, :path, :avatar)

    params.require(:group).permit(:name, :description, :path, :avatar, :visibility_level)

  end

  end

end
 
end