1. 29 Jul, 2015 5 commits
  2. 28 Jul, 2015 15 commits
  3. 27 Jul, 2015 6 commits
  4. 26 Jul, 2015 4 commits
  5. 25 Jul, 2015 5 commits
  6. 24 Jul, 2015 5 commits
    • Stan Hu's avatar
      71a8c780
    • Valery Sizov's avatar
      Merge branch 'fix-error-500-when-no-head' into 'master' · bbbcc965
      Valery Sizov authored
      Fix error 500 when no HEAD is available
      
      Steps to reproduce:
      
      1. Create a project with a README
      2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere`
      3. Check that HEAD is gone via `git ls-remote .`
      4. Go to the projects page and see the Error 500
      
      Error:
      
      ```
      NoMethodError - undefined method `sha' for nil:NilClass:
        app/helpers/projects_helper.rb:281:in `readme_cache_key'
        app/views/projects/_readme.html.haml:10:in `_app_views_projects__readme_html_haml___2036282917939462960_70154565285700'
        actionview (4.1.11) lib/action_view/template.rb:145:in `block in render'
        activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument'
        activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
        activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument'
        actionview (4.1.11) lib/action_view/template.rb:339:in `instrument'
        actionview (4.1.11) lib/action_view/template.rb:143:in `render'
        rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method'
        actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:306:in `render_partial'
        actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:279:in `block in render'
        actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument'
        activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument'
        activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
        activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument'
        actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `instrument'
        actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:278:in `render'
        actionview (4.1.11) lib/action_view/renderer/renderer.rb:47:in `render_partial'
        actionview (4.1.11) lib/action_view/helpers/rendering_helper.rb:35:in `render'
        haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `block in render_with_haml'
        haml (4.0.5) lib/haml/helpers.rb:89:in `non_haml'
        haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `render_with_haml'
        app/views/projects/show.html.haml:47:in `_app_views_projects_show_html_haml__1458303859692972698_70154948164180'
        actionview (4.1.11) lib/action_view/template.rb:145:in `block in render'
        activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument'
      ```
      
      Closes https://github.com/gitlabhq/gitlabhq/issues/9484, but there may be some other issue there.
      
      See merge request !1041
      bbbcc965
    • Valery Sizov's avatar
      Merge branch 'rs-issue-2058' into 'master' · 330109ee
      Valery Sizov authored
      Add admin_merge_request ability to Developer level and up
      
      This was necessary because this permission is checked dynamically by
      `app/views/shared/issuable/_context` when on a Merge Request.
      
      Closes #2058
      
      See merge request !1037
      330109ee
    • Robert Speicher's avatar
      Dynamically check `:admin_*` ability in IssuableBaseService · b9b2d086
      Robert Speicher authored
      Closes #2092
      b9b2d086
    • Robert Speicher's avatar
      Dynamically check `:admin_*` ability on issuable form · e496c35f
      Robert Speicher authored
      Closes #2092
      e496c35f