From 00d72e73c855613b7e07158a8975796dec7cf9ad Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Fri, 6 Dec 2013 20:11:14 +0100 Subject: [PATCH 1/4] Better warning when deleting a user Warn the administrator better when deleting a user. Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295 --- app/views/admin/users/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 9c5796a661..950f1a0271 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -54,5 +54,5 @@ = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success" - else = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove" - = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn btn-small btn-remove" + = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! All tickets linked to this user will also be removed! Maybe block the user instead? Are you sure?", method: :delete, class: "btn btn-small btn-remove" = paginate @users, theme: "gitlab" From 8583d7d186dc11ee5f5a05926fa3cf4dbe62eb52 Mon Sep 17 00:00:00 2001 From: Rovanion Luckey Date: Fri, 6 Dec 2013 21:21:59 +0100 Subject: [PATCH 2/4] Git clone now gets the right branch from the getgo Simplified the instructions by two steps. --- doc/install/installation.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 3e90663dbd..1b652d1e1d 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -144,13 +144,10 @@ GitLab Shell is an ssh access and repository management software developed speci cd /home/git # Clone gitlab shell - sudo -u git -H git clone https://github.com/gitlabhq/gitlab-shell.git + sudo -u git -H git clone https://github.com/gitlabhq/gitlab-shell.git -b v1.7.9 cd gitlab-shell - # switch to right version - sudo -u git -H git checkout v1.7.9 - sudo -u git -H cp config.yml.example config.yml # Edit config and replace gitlab_url @@ -174,14 +171,11 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install ## Clone the Source # Clone GitLab repository - sudo -u git -H git clone https://github.com/gitlabhq/gitlabhq.git gitlab + sudo -u git -H git clone https://github.com/gitlabhq/gitlabhq.git -b 6-3-stable gitlab # Go to gitlab dir cd /home/git/gitlab - # Checkout to stable release - sudo -u git -H git checkout 6-3-stable - **Note:** You can change `6-3-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! From d80fa8025b2feec5cd4485551e1bc95a92371e5d Mon Sep 17 00:00:00 2001 From: maltefiala Date: Sun, 8 Dec 2013 17:45:56 +0100 Subject: [PATCH 3/4] Added Rake:Attack cp information to Upgrade Guide 6.3.0 --- doc/update/6.2-to-6.3.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index ad4a509544..b7740a538e 100644 --- a/doc/update/6.2-to-6.3.md +++ b/doc/update/6.2-to-6.3.md @@ -63,7 +63,12 @@ git diff 6-2-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.examp * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-stable/config/gitlab.yml.example but with your settings. * Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-stable/config/unicorn.rb.example but with your settings. -* Copy rack attack middleware config + +```bash +# Copy rack attack middleware config +cd /home/git/gitlab +sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb +``` ### 6. Update Init script From 2c4e3e001f2e3b22546d9a0288ca7d2d7121fff1 Mon Sep 17 00:00:00 2001 From: Maxime Brugidou Date: Mon, 9 Dec 2013 11:06:12 +0100 Subject: [PATCH 4/4] Skip email confirmation with LDAP --- lib/gitlab/oauth/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb index ea9badba2c..529753c401 100644 --- a/lib/gitlab/oauth/user.rb +++ b/lib/gitlab/oauth/user.rb @@ -28,8 +28,8 @@ module Gitlab } user = model.build_user(opts, as: :admin) + user.skip_confirmation! user.save! - user.confirm! log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}" if Gitlab.config.omniauth['block_auto_created_users'] && !ldap?