delta/gitlab/gitlab-shell.git, branch fix_hook_env

Fix: Allow Git Hooks to be executed in another Ruby env when committing from the web UI

2016-09-13T14:21:43+00:00

Version 3.5.0

2016-09-02T14:23:03+00:00

Merge branch '2fa_recovery' into 'master'

2016-09-02T14:21:59+00:00


Add option to recover 2FA via SSH

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3765

Allow users to recover their own account if they lose their 2FA device or recovery codes. 

## Questions/Concerns

- Does this look secure? I think it is but we need to make sure no one can spoof a username or something and disable two factor.

## Todo

- [x] Working code
- [x] Tests
- [x] GitLab merge requests (including documentation)

![Screen_Shot_2016-08-18_at_2.34.18_PM](/uploads/1ed00e93abdfc3b41187c021e4f9d4db/Screen_Shot_2016-08-18_at_2.34.18_PM.png)

See merge request !74

Add option to recover 2FA via SSH

2016-08-26T20:10:31+00:00

Merge branch 'feature/redis-sentinel' into 'master'

2016-08-19T18:55:30+00:00


Sentinel Support

Sentinel connection parameters in `config.yml` file.

Fixes #29

See merge request !85

Remove useless `.and_call_origin` from specs

2016-08-19T18:26:19+00:00

Added sentinel to the changelog and version bump (v3.4.0)

2016-08-19T01:13:11+00:00

Added specs for sentinel support

2016-08-18T11:10:16+00:00

Sentinel connection parameters in `config.yml` file

2016-08-18T10:28:07+00:00

Merge branch 'dup-frozen-argv-key' into 'master'

2016-08-11T21:09:54+00:00


In order to use chomp! on the input later, we need to dup the ARGV input string for keys

Also updated the gitlab_key tests to freeze the ARGV variables.

Fixes https://gitlab.com/gitlab-org/gitlab-shell/issues/56

See merge request !84