1. 15 10月, 2016 35 次提交
  2. 14 10月, 2016 5 次提交
    • R
      Merge branch 'remove-period' into 'master' · 94587035
      Rémy Coutable 提交于
      Remove a period that can be annoying
      
      I looked through the labels, not even `P1` or `customer+` was able to really capture the importance of this MR and what it means for the future of GitLab.
      
      ## What does this MR do?
      
      It removes the period `.` at the end of the following line in the `Documentation` **Merge Request Template**
      
      `See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html.`
      
      ## Why was this MR needed?
      
      Because, while editing the MR `Description` the link is not clickable, so it is very easy to copy the link with the period `.` and then it ends up behaving like a broken link. I only realized that it was not a broken link because I was busy trying to find someone to fix the broken link.
      
      See merge request !6890
      94587035
    • Y
      Merge branch 'fix-banzai-renderer-instrumentation' into 'master' · eb575d28
      Yorick Peterse 提交于
      Use module_function in Banzai::Renderer
      
      See merge request !6886
      eb575d28
    • K
      Remove unecessary lock · 308769f8
      Kamil Trzcinski 提交于
      308769f8
    • J
      Merge branch 'dz-fix-user-select' into 'master' · 687384b5
      Jacob Schatz 提交于
      Validate user id for users select autcomplete
      
      ## What does this MR do?
      
      Adds digit validation to user_id when build user autocomplete URL for select2. 
      
      ## Why was this MR needed?
      
      To prevent building invalid URL for non existing users like  GET "/autocomplete/users/whatever@example.com.json".
      
      As result it fixes failing test:
      
      ```
      Feature: Admin Groups
      
        Scenario: Invite user to a group by e-mail
            Given I sign in as an admin                                                             # features/steps/shared/authentication.rb:11
            And I have group with projects                                                          # features/steps/admin/groups.rb:17
            And User "John Doe" exists                                                              # features/steps/shared/user.rb:4
            And I visit admin groups page                                                           # features/steps/shared/paths.rb:194
            When I visit admin group page                                                           # features/steps/admin/groups.rb:9
            When I select user "johndoe@gitlab.com" from user list as "Reporter"                    # features/steps/admin/groups.rb:48
            Then I should see "johndoe@gitlab.com" in team list in every project as "Reporter"      # features/steps/admin/groups.rb:63
      /Users/dzaporozhets/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call': No route matches [GET] "/autocomplete/users/johndoe@gitlab.com.json" (ActionController::RoutingError)
      ```
      
      See merge request !6889
      687384b5
    • D
      Merge branch 'dz-fix-user-select' · 6743566b
      Dmitriy Zaporozhets 提交于
      6743566b