Commits · acf1209a92472c83d4200fbbe038416d1209c8e3 · nexedi / gitlab-shell

04 Jul, 2014 3 commits

Merge branch 'master' of github.com:gitlabhq/gitlab-shell · acf1209a
Dmitriy Zaporozhets authored Jul 04, 2014

acf1209a
Merge pull request #158 from Aigeruth/improvement/coverage · 80422c66
Dmitriy Zaporozhets authored Jul 04, 2014
```
Improve coverage.
```
80422c66

Merge branch 'working_gitlab_url' into 'master' · 456ba294

Dmitriy Zaporozhets authored Jul 04, 2014

Use a default for gitlab_url that usually works

This default lets gitlab-shell connect to Unicorn directly, instead of
going through Nginx. This has the following benefits:

- the majority of users no longer has to edit the `gitlab_url`;
- avoid issues when the external GitLab web address does not resolve on
  the GitLab server itself;
- avoid SSL certificate issues.

See merge request !32

456ba294

23 Jun, 2014 1 commit
- Improve coverage. · 32f18932
  Gabor Nagy authored Jun 22, 2014
  
  32f18932
20 Jun, 2014 2 commits
- Mention Unicorn on a domain socket as an exception · 2e1217ea
  Jacob Vosmaer authored Jun 20, 2014
  
  2e1217ea
- Use a default for gitlab_url that usually works · cd8dbeba
  Jacob Vosmaer authored Jun 20, 2014
  
  cd8dbeba
10 Jun, 2014 3 commits
- Bump version · ca425566
  Dmitriy Zaporozhets authored Jun 10, 2014
  
  ca425566
- Merge branch 'require_timeout' into 'master' · aa7b34bc
  Dmitriy Zaporozhets authored Jun 10, 2014
```
Expliclity require 'timeout' from the stdlib
```
  aa7b34bc
- Expliclity require 'timeout' from the stdlib · 5cd99d57
  Jacob Vosmaer authored Jun 10, 2014
```
This avoids getting the following error on some platforms:

NameError: uninitialized constant GitlabKeys::Timeout
```
  5cd99d57
31 May, 2014 5 commits
- Version 1.9.5 · 52988006
  Dmitriy Zaporozhets authored May 31, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  52988006
- Merge branch 'add-key-lock' into 'master' · c638971d
  Dmitriy Zaporozhets authored May 31, 2014
```
Use lock file when add new entries to authorized_keys

Fixes #21
```
  c638971d
- Create keys fixtures in test · 8402c1bc
  Dmitriy Zaporozhets authored May 31, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8402c1bc
- Use authorized_keys lock when add new key to file · 324fa5ce
  Dmitriy Zaporozhets authored May 31, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  324fa5ce
- Merge branch 'lock_file_location' into 'master' · 025f97aa
  Dmitriy Zaporozhets authored May 31, 2014
```
Lock file location
```
  025f97aa
30 May, 2014 1 commit
- Put authorized_keys.lock in the .ssh directory · 2c5d04de
  Jacob Vosmaer authored May 30, 2014
  
  2c5d04de
24 Apr, 2014 1 commit
- Version 1.9.4 · c26647b9
  Dmitriy Zaporozhets authored Apr 24, 2014
  
  c26647b9
22 Apr, 2014 1 commit
- Merge branch 'authorized_keys_lock' into 'master' · 4038ef2e
  Dmitriy Zaporozhets authored Apr 22, 2014
```
Authorized keys lock
```
  4038ef2e
18 Apr, 2014 2 commits
- Mention lock file in changelog · 19a5c54a
  Dmitriy Zaporozhets authored Apr 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  19a5c54a
- Use lock file when add or remove keys from authorized_keys file · acc1d883
  Dmitriy Zaporozhets authored Apr 18, 2014
```
This prevents concurrent modification of authorized_keys file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  acc1d883
15 Apr, 2014 2 commits
- Merge branch 'spec_popen_fix_1.9.3' into 'master' · d8600696
  Dmitriy Zaporozhets authored Apr 15, 2014
```
Fix spec failure in Ruby 1.9.3
```
  d8600696
- Invoke IO.popen correctly for Ruby 1.9.3 · 7e79354d
  Jacob Vosmaer authored Apr 11, 2014
```
Before this change, tests in gitlab_projects_spec were passing on Ruby
2.0.0 but not on 1.9.3.
```
  7e79354d
14 Apr, 2014 3 commits
- Use h1 headers in readme · 2f5c5f61
  Dmitriy Zaporozhets authored Apr 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2f5c5f61
- Inline badges · 7bd50ac4
  Dmitriy Zaporozhets authored Apr 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7bd50ac4
- Fix tests · 639e8e60
  Dmitriy Zaporozhets authored Apr 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  639e8e60
11 Apr, 2014 1 commit
- Merge pull request #145 from lsjostro/fix_env · 35aef23f
  Jacob Vosmaer authored Apr 11, 2014
```
Preserve LD_LIBRARY_PATH for Kernel::exec
```
  35aef23f
03 Apr, 2014 5 commits
- Version 1.9.3 · dd94f793
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dd94f793
- Fix fatal: bad object 0000 when do new branch push · 2cf37f44
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2cf37f44
- Version 1.9.2 · 543c2f99
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  543c2f99
- Make force push detection actually work · d299e7ef
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d299e7ef
- Merge pull request #128 from... · d5adeb1f
  Dmitriy Zaporozhets authored Apr 03, 2014
```
Merge pull request #128 from Popl7/add-better-branch-protection-against-history-rewrite-and-deletion

protect protected branched to force updates
```
  d5adeb1f
26 Mar, 2014 1 commit
- set LD_LIBRARY_PATH for Kernel::exec · b136e22d
  Lars Sjöström authored Mar 26, 2014
  
  b136e22d
25 Mar, 2014 1 commit
- first setup to protect protected branched to force updates · f79bb5a3
  Steven Thonus authored Jan 28, 2014
```
rebased for new code
```
  f79bb5a3
20 Mar, 2014 4 commits
- Version 1.9.1 · ce88b74d
  Dmitriy Zaporozhets authored Mar 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ce88b74d
- Pass tag name to update hook too · 64296a0d
  Dmitriy Zaporozhets authored Mar 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  64296a0d
- Version 1.9.0 · 3a960b7e
  Dmitriy Zaporozhets authored Mar 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3a960b7e
- Merge branch 'improve-git-update' into 'master' · f548511c
  Dmitriy Zaporozhets authored Mar 20, 2014
```
Improve Git Update
```
  f548511c
19 Mar, 2014 2 commits
- Fix tests · 84c5f49d
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  84c5f49d
- Send api.allowed? request for both http and ssh push · b29a61eb
  Dmitriy Zaporozhets authored Mar 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b29a61eb
15 Mar, 2014 2 commits
- version 1.8.5 · e294b344
  Dmitriy Zaporozhets authored Mar 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e294b344
- Merge branch 'fix_changelog' into 'master' · 065e8e79
  Dmitriy Zaporozhets authored Mar 15, 2014
```
Fix Changelog
```
  065e8e79