From 684d772b8a5af728dae1ce4ba32c2fdf4d584355 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Thu, 16 May 2013 22:16:41 +0200
Subject: [PATCH 1/7] Fix typo in install docs, closes #3723
---
doc/install/installation.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 7fd0aad52be..92099d235f5 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!**
--
GitLab
From 35e8a838ebf43b6b4c846df06293235d4f7ea92a Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew.blessing@buckle.com>
Date: Fri, 17 May 2013 15:05:22 -0500
Subject: [PATCH 2/7] Test snippets_enabled api change
---
lib/api/projects.rb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index d9743b4539a..7dfcc0dbb3a 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?
--
GitLab
From 75ce6c0c8f2a2e027c3906398b5530be34df8919 Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew.blessing@buckle.com>
Date: Fri, 17 May 2013 15:23:32 -0500
Subject: [PATCH 3/7] Expose snippets
---
lib/api/entities.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index c3c351e1733..3e9be28519f 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
--
GitLab
From 2f69171a8a78fda542f1dd0196b588450c7fb71d Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Fri, 17 May 2013 16:39:55 -0600
Subject: [PATCH 4/7] Typo fixes
---
doc/raketasks/cleanup.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/raketasks/cleanup.md b/doc/raketasks/cleanup.md
index 30a5d362caa..99809ef434d 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
--
GitLab
From 2d1875960212d40cb348cefb29ac78828498bc66 Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Sat, 18 May 2013 06:39:33 -0600
Subject: [PATCH 5/7] Typo fix closes gitlabhq/gitlabhq/3984
---
doc/install/databases.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/install/databases.md b/doc/install/databases.md
index a198e726aa0..2d94aa9b4a3 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
--
GitLab
From d89ce9be81fe0abccc830f04ec23be8e57303b54 Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew.blessing@buckle.com>
Date: Sat, 18 May 2013 19:37:39 -0500
Subject: [PATCH 6/7] Also expose snippets_enabled for create a project for a
user
---
lib/api/projects.rb | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 7dfcc0dbb3a..04b16038c41 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -75,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
@@ -90,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
--
GitLab
From 1f64cb35f700a366774a6d8113410c6437ef27c6 Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew.blessing@buckle.com>
Date: Fri, 17 May 2013 15:05:22 -0500
Subject: [PATCH 7/7] Issue 3599: Add snippets_enabled flag to projects for API
Test snippets_enabled api change
Expose snippets
Also expose snippets_enabled for create a project for a user
---
lib/api/entities.rb | 2 +-
lib/api/projects.rb | 22 +++++++++++++---------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index c3c351e1733..3e9be28519f 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 d9743b4539a..04b16038c41 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
--
GitLab