1. 30 Jul, 2015 8 commits
    • Jacob Vosmaer's avatar
      Merge branch 'fix-rake-check-hooks' into 'master' · c13e2290
      Jacob Vosmaer authored
      Check that hooks directory exists before attempting to call realpath
      
      This MR checks that the hooks directories actually exist before attempting to resolve their `realpath`.
      
      Users who attempted to restore from source to an omnibus installation would get ugly errors when running `gitlab-rake gitlab:check`:
      
      ```
      Errno::ENOENT: No such file or directory @ realpath_rec - /var/opt/gitlab/git-data/repositories/Wanda/www.git/hooks
      /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `realpath'
      /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `block in check_repos_hooks_directory_is_link'
      /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block (2 levels) in find_each'
      /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `each'
      /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block in find_each'
      /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:126:in `find_in_batches'
      /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:51:in `find_each'
      /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/querying.rb:9:in `find_each'
      /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:482:in `check_repos_hooks_directory_is_link'
      /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:343:in `block (3 levels) in <top (required)>'
      Tasks: TOP => gitlab:check => gitlab:gitlab_shell:check
      ```
      
      Closes #2121
      
      #2082
      
      See merge request !1068
      c13e2290
    • Stan Hu's avatar
      Check that hooks directory exists before attempting to call realpath · ee171028
      Stan Hu authored
      Closes #2121
      ee171028
    • Douwe Maan's avatar
      Merge branch 'fix-single-quote-in-network-graph' into 'master' · 1e4b3264
      Douwe Maan authored
      Fix network graph when branch name has single quotes
      
      ## Steps to reproduce
      
      1. Create a branch with a single quote in the branch name: "`test`"
      2. Look at Project's Network view
      
      Closes https://github.com/gitlabhq/gitlabhq/issues/9500
      
      See merge request !1063
      1e4b3264
    • Job van der Voort's avatar
      Merge branch 'ssh-key-form' into 'master' · ae36842d
      Job van der Voort authored
      Switched the order of the SSH key form
      
      Now it looks like this:
      
      ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/dca3353266e93cec9cfd9f2f16af8657/image.png)
      
      
      See merge request !1069
      ae36842d
    • Marin Jankovski's avatar
      Merge branch 'fix-rake-import-check' into 'master' · eb86e3ed
      Marin Jankovski authored
      Check that project was actually created rather than just validated in import:repos task
      
      Add gitlab-shell to error message to give user a clue that something may be wrong there.
      
      Ran into this in #2082. User was told that repositories were created when they were
      not due to `hooks` symlink being wrong.
      
      See merge request !1039
      eb86e3ed
    • Stan Hu's avatar
      Merge branch 'typo-corrections' into 'master' · 6b5551d9
      Stan Hu authored
      Minor styling fixes
      
      - Link to rendered html instead of markdown source.
      - Removed typos
      
      See merge request !1044
      6b5551d9
    • Stan Hu's avatar
    • Achilleas Pipinellis's avatar
      Merge branch 'omniauth-twitter' into 'master' · c63f1486
      Achilleas Pipinellis authored
      Updated Twitter OmniAuth documentation
      
      See merge request !1071
      c63f1486
  2. 29 Jul, 2015 15 commits
  3. 28 Jul, 2015 17 commits