diff --git a/doc/install/databases.md b/doc/install/databases.md index a198e726aa00b64d497263455619bebdeb015522..2d94aa9b4a314ae3e67f0a9c7dcb2cc738922144 100644 --- a/doc/install/databases.md +++ b/doc/install/databases.md @@ -20,7 +20,7 @@ GitLab supports the following databases: # Create the GitLab production database mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; - # Grant the GitLab user necessary permissopns on the table. + # Grant the GitLab user necessary permissions on the table. mysql> GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'gitlab'@'localhost'; # Quit the database session diff --git a/doc/install/installation.md b/doc/install/installation.md index d6679222dd5be2f7c5ca32cf007f71c6fdf5155e..7e2c28135d37dda8400d3a5fa410e8a2da4c58b2 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -282,7 +282,7 @@ The setup has created an admin account for you. You can use it to log in: 5iveL!fe **Important Note:** -Please go over to your profile page and immediately chage the password, so +Please go over to your profile page and immediately change the password, so nobody can access your GitLab by using this login information later on. **Enjoy!** diff --git a/doc/raketasks/cleanup.md b/doc/raketasks/cleanup.md index 30a5d362caa8b3d9c9bada3b0a921c73b4c10775..99809ef434df7212d31a144f09596ae2c67c8011 100644 --- a/doc/raketasks/cleanup.md +++ b/doc/raketasks/cleanup.md @@ -1,12 +1,12 @@ -### Remove grabage from filesystem. Important! Data loss! +### Remove garbage from filesystem. Important! Data loss! -Remove namespaces(dirs) from /home/git/repositories if they dont exist in GitLab database +Remove namespaces(dirs) from `/home/git/repositories` if they don't exist in GitLab database. ``` bundle exec rake gitlab:cleanup:dirs RAILS_ENV=production ``` -Remove repositories (global only for now) from /home/git/repositories if they dont exist in GitLab database +Remove repositories (global only for now) from `/home/git/repositories` if they don't exist in GitLab database. ``` bundle exec rake gitlab:cleanup:repos RAILS_ENV=production diff --git a/lib/api/entities.rb b/lib/api/entities.rb index c3c351e1733b5edd0b2d75eae05dcec7357df0f0..3e9be28519f4b6fc220515f161a84cc66ae50d44 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -30,7 +30,7 @@ module API expose :owner, using: Entities::UserBasic expose :public expose :path, :path_with_namespace - expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at + expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :snippets_enabled, :created_at expose :namespace end diff --git a/lib/api/projects.rb b/lib/api/projects.rb index d9743b4539ac6f57564d01103aee952c619eb929..04b16038c41240b015256f04df4eb09b75ff44e9 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -38,10 +38,11 @@ module API # name (required) - name for new project # description (optional) - short project description # default_branch (optional) - 'master' by default - # issues_enabled (optional) - enabled by default - # wall_enabled (optional) - enabled by default - # merge_requests_enabled (optional) - enabled by default - # wiki_enabled (optional) - enabled by default + # issues_enabled (optional) + # wall_enabled (optional) + # merge_requests_enabled (optional) + # wiki_enabled (optional) + # snippets_enabled (optional) # namespace_id (optional) - defaults to user namespace # Example Request # POST /projects @@ -54,6 +55,7 @@ module API :wall_enabled, :merge_requests_enabled, :wiki_enabled, + :snippets_enabled, :namespace_id] @project = ::Projects::CreateContext.new(current_user, attrs).execute if @project.saved? @@ -73,10 +75,11 @@ module API # name (required) - name for new project # description (optional) - short project description # default_branch (optional) - 'master' by default - # issues_enabled (optional) - enabled by default - # wall_enabled (optional) - enabled by default - # merge_requests_enabled (optional) - enabled by default - # wiki_enabled (optional) - enabled by default + # issues_enabled (optional) + # wall_enabled (optional) + # merge_requests_enabled (optional) + # wiki_enabled (optional) + # snippets_enabled (optional) # Example Request # POST /projects/user/:user_id post "user/:user_id" do @@ -88,7 +91,8 @@ module API :issues_enabled, :wall_enabled, :merge_requests_enabled, - :wiki_enabled] + :wiki_enabled, + :snippets_enabled] @project = ::Projects::CreateContext.new(user, attrs).execute if @project.saved? present @project, with: Entities::Project