1. 06 May, 2015 8 commits
    • Dmitriy Zaporozhets's avatar
      Merge branch '7-10-2' into '7-10-stable' · bba314b6
      Dmitriy Zaporozhets authored
      Fixes for 7.10.2
      
      See merge request !1804
      bba314b6
    • Douwe Maan's avatar
      Merge branch 'fix-commit-data-url-generation' into 'master' · c99f4e93
      Douwe Maan authored
      Fix bug where commit data would not appear in some subdirectories
      
      Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example:
      
      https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix)
      
      The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b7) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior.
      
      * Closes #1478, #1459
      * Closes https://github.com/gitlabhq/gitlabhq/issues/9037
      
      See merge request !581
      c99f4e93
    • Douwe Maan's avatar
      Merge branch 'fix-escaped-branches-in-compare' into 'master' · fe38be8b
      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
      fe38be8b
    • Douwe Maan's avatar
      Merge branch 'fix-project-tags' into 'master' · 81634bc1
      Douwe Maan authored
      Fix DB error when trying to tag a repository
      
      Steps to reproduce: Go to a project settings, add tags, click on save changes
      
      Observed behavior: Error 500
      
      ```
          PG::Error: ERROR:  column "taggings_count" does not exist
              LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun...
      ```
      
      Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first
      migration that created the `tags` and `taggings` table, and added the rest.
      
      * Closes #1512
      * Closes #1550
      * Closes https://github.com/gitlabhq/gitlabhq/issues/6867
      * Closes https://github.com/gitlabhq/gitlabhq/issues/9194
      
      See merge request !577
      81634bc1
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-wiki-search' into 'master' · 3976630c
      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
      3976630c
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix_ci_services' into 'master' · 7ef05ad0
      Dmitriy Zaporozhets authored
      Fix CI links on MR page
      
      Fixes gitlab-org/gitlab-ci#145
      
      See merge request !609
      7ef05ad0
    • Dmitriy Zaporozhets's avatar
      Merge branch 'admin-add-group-members' into 'master' · 8ef84b3e
      Dmitriy Zaporozhets authored
      Fix adding new group members from admin area
      
      Fix for #2222
      
      Tests for this case already exists but it was green.
      It related to current way dealing with ajax selectbox.
      Improving tests might be a reason for another merge requests - everyone is welcome to participate.
      
      See merge request !1796
      8ef84b3e
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-gitorious-importer' into 'master' · d4516cf5
      Dmitriy Zaporozhets authored
      Get Gitorious importer to work again.
      
      Fixes #1504.
      
      See merge request !576
      d4516cf5
  2. 29 Apr, 2015 2 commits
  3. 22 Apr, 2015 4 commits
  4. 21 Apr, 2015 6 commits
  5. 20 Apr, 2015 9 commits
  6. 17 Apr, 2015 5 commits
  7. 16 Apr, 2015 6 commits