Commits on Dec 1, 2015
  1. @randx

    Merge branch 'stricter-exec_cmd' into 'master'

    Stricter exec cmd
    
    In response to the gitlab-shell 2.6.6-2.6.7 remote code execution
    vulnerability.
    
    See merge request !33
    randx committed Dec 1, 2015
Commits on Nov 25, 2015
  1. @randx

    Merge branch 'y/git-home' into 'master'

    Pass $HOME to git as well
    
    [ this patch has the same rationale and reasoning as
      https://gitlab.com/gitlab-org/gitlab-workhorse/commit/0d0bd209
    
      details follow ]
    
    Git has 3 places for configs:
    
        - system
        - global (per user), and
        - local  (per repository)
    
    System config location is hardcoded at git compile time (to usually
    $prefix/etc/gitconfig). Local configuration is usually picked because we
    pass full repo path to subcommand. But global configuration is currently not
    picked at all, because HOME env variable is not passed to git.
    
    Pass $HOME through and let git see it's "global" config.
    
    Currently GitLab omnibus stores gitlab user name/email  + "autocrlf =
    true" in global config, so missing it should not be a blocker for
    receive/send-pack operations. But having it is more correct and can be
    handy in the future if/when more git operations are done from-under
    gitlab-shell.
    
    Having $HOME properly set is also needed when one cannot change system
    git config and have to put site-wide configuration into global git
    config under $HOME.
    
    That was the case I've hit and the reason for this patch.
    
    /cc @dzaporozhets, @jacobvosmaer
    
    See merge request !32
    randx committed Nov 25, 2015
  2. @randx

    Merge branch 'revert-lfs-authenticate' into 'master'

    Revert "Run git-lfs-authenticate script with original command line arguments"
    
    This reverts commit 8449979.
    
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    
    Related to: #35, gitlab/gitlabhq#2635
    
    See merge request !68
    randx committed Nov 25, 2015
  3. @randx

    Bump version to 2.6.8

    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    randx committed Nov 25, 2015
  4. @randx

    Return changelog item for 2.6.6

    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    randx committed Nov 25, 2015
  5. @randx

    Revert "Run git-lfs-authenticate script with original command line ar…

    …guments"
    
    This reverts commit 8449979.
    
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    randx committed Nov 25, 2015
Commits on Nov 12, 2015
  1. @randx

    Revert "Merge branch 'use-load-path' into 'master' "

    This reverts commit ae498b6, reversing
    changes made to 79fdf65.
    randx committed Nov 12, 2015
  2. @randx

    Merge branch 'y/httpunix2' into 'master'

    Add support to connect gitlab-shell to Unicorn via UNIX socket  (v2)
    
    Hello up there.
    
    I'm doing SlapOS port of GitLab, and that means several different services could be running on the same machine, including several GitLabs.
    
    So far all internal GitLab subservices could be glued together via UNIX sockets except gitlab-shell -> Unicorn link, which, when done via local TCP, requires firewall/network namespaces to protect services on one machine from each other.
    
    On the other hand access to UNIX domain sockets is managed via regular UNIX permissions on filesystem, and thus is easier to manage. Besides UNIX domain sockets are well known to be faster compared to TCP over loopback - in particular to have ~ 2 times less latency and ~ 2 times more throughput.
    
    From this point of view it makes sense to teach gitlab-shell to talk to Unicorn via UNIX socket and switch to that mode by default eventually.
    
    I've just made a patch for this. Please apply.
    
    Thanks beforehand,  
    Kirill
    
    /cc @dzaporozhets, @jacobvosmaer, @rspeicher 
    
    See merge request !30
    randx committed Nov 12, 2015
  3. @randx

    Merge branch 'use-load-path' into 'master'

    Use load path, set ROOT_PATH via ENV
    
    Uses load path instead of require_relative, adds an environment variable to set gitlab-shell ROOT_PATH variable (Fixes #30)
    
    See merge request !28
    randx committed Nov 12, 2015
Commits on Oct 22, 2015
  1. @randx

    Merge branch 'bump_2.6.6' into 'master'

    Version bump 2.6.6
    
    
    
    See merge request !22
    randx committed Oct 22, 2015
Commits on Oct 21, 2015
  1. @randx
Commits on Oct 1, 2015
  1. @randx

    Merge branch 'no-init-on-gcryptsetup' into 'master'

    Skip 'git annex init' when using 'gcryptsetup'
    
    'gcryptsetup' is a special git-annex feature that does its own
    initialization.
    
    See merge request !18
    randx committed Oct 1, 2015
Commits on Sep 10, 2015
  1. @randx

    Merge branch 'bozaro/gitlab-shell-git-lfs-authenticate'

    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    randx committed Sep 10, 2015
  2. @randx

    Merge branch 'bozaro/gitlab-shell-lang'

    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    randx committed Sep 10, 2015
Commits on Aug 5, 2015
  1. @randx

    Merge branch 'version_bump' into 'master'

    Version bump 2.6.4
    
    
    
    See merge request !17
    randx committed Aug 5, 2015
Commits on Aug 4, 2015
  1. @randx
Commits on Jul 17, 2015
  1. @randx

    Merge branch 'batch-add-keys-timeout'

    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    randx committed Jul 17, 2015
  2. @randx

    Merge branch 'faster-rm-key' into 'master'

    Remove keys from authorized_keys in-place
    
    This will speed up the rm-key operation. The downside is that
    authorized_keys will not shrink when you remove a key. If this ever
    becomes a problem it can be fixed by running 'rake gitlab🐚setup'.
    
    See merge request !66
    randx committed Jul 17, 2015
Commits on Jul 6, 2015
  1. @randx

    Merge pull request #230 from bozaro/git-lfs-authenticate

    Add git-lfs-authenticate to command white list
    randx committed Jul 6, 2015
Commits on Jul 1, 2015
  1. @randx

    Merge branch 'yml-script' into 'master'

    Add gitlab-ci yml script
    
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    
    cc @vsizov
    
    See merge request !14
    randx committed Jul 1, 2015
  2. @randx

    Add gitlab-ci yml script

    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    randx committed Jul 1, 2015
Commits on Jun 11, 2015
  1. @randx

    Merge branch 'note_in_config' into 'master'

    Add a note that changing example configuration files requires changing omnibus-gitlab.
    
    Keeping track of changes in these files is not easy and they usually require change in omnibus-gitlab.
    
    Added a note so everyone is aware of this.
    
    Similar is added to gitlab-ce and gitlab-ci.
    
    Discussed in gitlab-org/omnibus-gitlab#605
    
    See merge request !13
    randx committed Jun 11, 2015
Commits on Apr 14, 2015
  1. @randx

    Merge branch 'safe-rm-key' into 'master'

    Prevent keys with a very specific comment from accidentally being deleted.
    
    Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-shell/issues/32.
    
    See merge request !11
    randx committed Apr 14, 2015
Commits on Apr 13, 2015
  1. @randx

    Add changelog entry about GL_ID

    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    randx committed Apr 13, 2015
  2. @randx

    Merge branch 'list-ecdsa' into 'master'

    Include ecdsa keys in `gitlab_keys list-keys`.
    
    Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-shell/issues/31.
    
    See merge request !12
    randx committed Apr 13, 2015
  3. @randx
  4. @randx

    Merge branch 'gl-id-refactor' into 'master'

    Refactor logic around GL_ID.
    
    Builds upon !8.
    
    See merge request !9
    randx committed Apr 13, 2015
Commits on Apr 10, 2015
  1. @randx

    Merge pull request #212 from jirutka/patch-1

    Allow to configure location of the secret file
    randx committed Apr 10, 2015
Commits on Apr 9, 2015
  1. @randx

    Version 2.6.1

    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    randx committed Apr 9, 2015
  2. @randx

    Merge branch 'nice-error-message' into 'master'

    Write errors to stderr to get git to abort and show them as such.
    
    Addresses private issues https://dev.gitlab.org/gitlab/gitlab-shell/issues/33 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2195.
    
    ![Screen_Shot_2015-04-06_at_13.05.43](https://gitlab.com/gitlab-org/gitlab-shell/uploads/56a4b9f4cc983da93afeb2b85252ec7e/Screen_Shot_2015-04-06_at_13.05.43.png)
    
    See merge request !8
    randx committed Apr 9, 2015
Commits on Mar 16, 2015
  1. @randx
  2. @randx

    Merge branch 'post-receive-base64' into 'master'

    Prevent character encoding issues by sending received changes as raw data.
    
    Better alternative to !64 that doesn't require new gems and leaves dealing with string character encoding to gitlab-rails. See gitlab/gitlabhq!1701 for the corresponding changes there.
    
    Fixes:
    
    - gitlabhq/gitlabhq#7486
    - https://gitlab.com/gitlab-org/gitlab-ce/issues/858
    - https://gitlab.com/gitlab-org/gitlab-ce/issues/877
    - https://gitlab.com/gitlab-org/gitlab-ce/issues/965
    
    See merge request !65
    randx committed Mar 16, 2015
Commits on Mar 4, 2015
  1. @randx

    Stub repo path for tests

    randx committed Mar 4, 2015
  2. @randx
Commits on Mar 3, 2015
  1. @randx

    Enable rubocop rule

    randx committed Mar 2, 2015