Download as
Browse Code »

Commit 16697f6efa4653986753905ab9100fa11dde7f09

Authored by Dmitriy Zaporozhets
2 parents 6a90378d 27900efb
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 4 changed files with 10 additions and 11 deletions   Show diff stats
app/views/admin/users/index.html.haml
  Diff comments   View file @16697f6
... ... @@ -54,5 +54,5 @@
54 54 = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success"
55 55 - else
56 56 = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
57   - = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn btn-small btn-remove"
  57 + = 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"
58 58 = paginate @users, theme: "gitlab"
... ...
doc/install/installation.md
  Diff comments   View file @16697f6
... ... @@ -144,13 +144,10 @@ GitLab Shell is an ssh access and repository management software developed speci
144 144 cd /home/git
145 145  
146 146 # Clone gitlab shell
147   - sudo -u git -H git clone https://github.com/gitlabhq/gitlab-shell.git
  147 + sudo -u git -H git clone https://github.com/gitlabhq/gitlab-shell.git -b v1.7.9
148 148  
149 149 cd gitlab-shell
150 150  
151   - # switch to right version
152   - sudo -u git -H git checkout v1.7.9
153   -
154 151 sudo -u git -H cp config.yml.example config.yml
155 152  
156 153 # Edit config and replace gitlab_url
... ... @@ -174,14 +171,11 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
174 171 ## Clone the Source
175 172  
176 173 # Clone GitLab repository
177   - sudo -u git -H git clone https://github.com/gitlabhq/gitlabhq.git gitlab
  174 + sudo -u git -H git clone https://github.com/gitlabhq/gitlabhq.git -b 6-3-stable gitlab
178 175  
179 176 # Go to gitlab dir
180 177 cd /home/git/gitlab
181 178  
182   - # Checkout to stable release
183   - sudo -u git -H git checkout 6-3-stable
184   -
185 179 **Note:**
186 180 You can change `6-3-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
187 181  
... ...
doc/update/6.2-to-6.3.md
  Diff comments   View file @16697f6
... ... @@ -63,7 +63,12 @@ git diff 6-2-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.examp
63 63  
64 64 * 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.
65 65 * 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.
66   -* Copy rack attack middleware config
  66 +
  67 +```bash
  68 +# Copy rack attack middleware config
  69 +cd /home/git/gitlab
  70 +sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
  71 +```
67 72  
68 73 ### 6. Update Init script
69 74  
... ...
lib/gitlab/oauth/user.rb
  Diff comments   View file @16697f6
... ... @@ -28,8 +28,8 @@ module Gitlab
28 28 }
29 29  
30 30 user = model.build_user(opts, as: :admin)
  31 + user.skip_confirmation!
31 32 user.save!
32   - user.confirm!
33 33 log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
34 34  
35 35 if Gitlab.config.omniauth['block_auto_created_users'] && !ldap?
... ...