Skip to content
Snippets Groups Projects
  1. Jan 21, 2016
    • Tomasz Maczukin's avatar
    • Tomasz Maczukin's avatar
      Merge branch 'master' into feature/check-against-rbl · bf64752c
      Tomasz Maczukin authored
      * master: (102 commits)
        Removes 100% width because it is a block element.
        Implement new UI for pagination
        Remove Performance Monitoring from Integration docs
        Update CHANGELOG
        Change InfluxDB admin username
        Creator should be added as a master of the project on creation
        Move integration/metrics to monitoring/performance
        Fix cross projects detection when importing GitHub pull requests
        Mention required Ruby version
        Use a MR with commits.
        Validate bounds just to be sure
        Fix term height so text overflap does not happen.
        Properly highlight lines around '\ No newline at end of file'
        Save and use actual diff base commit for MR diff highlighting
        Update tests
        updated gitlab_git to fix issue #5858 and updated changelog
        Simplifies the HAML if statement for project branch URL
        Target '_blank'
        Send user context to Sentry
        Gracefully handle invalid UTF-8 sequences in Markdown links
        ...
      
      Conflicts:
      	app/controllers/admin/application_settings_controller.rb
      	app/models/application_setting.rb
      	app/views/admin/application_settings/_form.html.haml
      	db/schema.rb
      	lib/dnsxl_check.rb
      	lib/gitlab/ip_check.rb
      bf64752c
    • Jacob Schatz's avatar
      Merge branch 'new-pagination' into 'master' · a4ff270d
      Jacob Schatz authored
      Implement new UI for pagination
      
      Fixes #6063 ![Screenshot_2016-01-20_09.38.59](/uploads/f50d333bdb6cb9683848fb0a874241ef/Screenshot_2016-01-20_09.38.59.png)
      
      
      See merge request !2517
      a4ff270d
    • Jacob Schatz's avatar
      ceab1286
    • Dmitriy Zaporozhets's avatar
      Implement new UI for pagination · 8367e4ab
      Dmitriy Zaporozhets authored and Jacob Schatz's avatar Jacob Schatz committed
      8367e4ab
    • Dmitriy Zaporozhets's avatar
      Merge branch 'ui-is-broken-in-search-result-page' into 'master' · 1f9153b9
      Dmitriy Zaporozhets authored
      Fix term height so text overflap does not happen.
      
      Fixes #12449 
      
      Height was set on the `.term`. It made the text overlap. 
      
      See merge request !2518
      1f9153b9
  2. Jan 20, 2016
Loading