1. 04 May, 2015 4 commits
    • Jakob Englisch's avatar
      Docker: update omnibus package · b7decf1d
      Jakob Englisch authored
      b7decf1d
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-wiki-search' into 'master' · 16db51ec
      Dmitriy Zaporozhets authored
      Fix Error 500 when searching Wiki pages
      
      If a Wiki page turns up a hit in the search results, an error will occur:
      
      ```
      Completed 500 Internal Server Error in 836ms
      
      NoMethodError - undefined method `slug' for "test.markdown":String:
        app/helpers/wiki_helper.rb:10:in `namespace_project_wiki_path'
        app/views/search/results/_wiki_blob.html.haml:4:in `_app_views_search_results__wiki_blob_html_haml___2752621660395393333_70299911622700'
        actionview (4.1.9) lib/action_view/template.rb:145:in `block in render'
        activesupport (4.1.9) lib/active_support/notifications.rb:161:in `instrument'
        actionview (4.1.9) lib/action_view/template.rb:339:in `instrument'
        actionview (4.1.9) lib/action_view/template.rb:143:in `render'
      ```
      
      An unhandled String containing the name of the Wiki page would be provided to the URL path generator. This MR handles that case.
      
      Closes #1547
      
      See merge request !592
      16db51ec
    • Douwe Maan's avatar
      Merge branch 'fix-escaped-branches-in-compare' into 'master' · e9e79fdf
      Douwe Maan authored
      Unescape branch names in compare commit
      
      The upgrade in GitLab v7.9 to Rails v4.1.9 caused all branch names in the compare commit mode to be escaped (e.g. `/` to `%2F`). The compare mode would not always work when comparing against branch names with a forward slash.
      
      Opted to unescape the branch name rather than use a wildcard segment to prevent escaping slashes because it seems like a more sensible URL. The slashes in this case aren't really represented by a tree structure (e.g. /compare/one/two/branch..another/branch/here).
      
      * Closes #1399
      * Closes https://github.com/gitlabhq/gitlabhq/issues/9105
      
      See merge request !582
      e9e79fdf
    • Robert Speicher's avatar
      Merge branch 'annotate-models-update' into 'master' · 3466ee7c
      Robert Speicher authored
      Re-annotate models
      
      Re-ran `annotate` to fix model annotations.
      
      See merge request !603
      3466ee7c
  2. 03 May, 2015 21 commits
  3. 02 May, 2015 10 commits
  4. 01 May, 2015 5 commits