1. 02 May, 2017 5 commits
    • Filipa Lacerda's avatar
      Merge branch 'master' into 2222-deploy-boards-polling · c40bd6e0
      Filipa Lacerda authored
      * master:
        Display comments for personal snippets
        Properly enable rspec_profiling for PG jobs only on the CI
      c40bd6e0
    • Sean McGivern's avatar
      Merge branch 'ee-12910-personal-snippets-notes-show' into 'master' · 6873e735
      Sean McGivern authored
      Port of 12910-personal-snippets-notes-show into EE
      
      See merge request !1768
      6873e735
    • Robert Speicher's avatar
      Merge branch 'ee-31500-fix-rspec_profiling-reporting' into 'master' · c7075a1a
      Robert Speicher authored
      [EE] Resolve "rspec_profiling is enabled for MySQL"
      
      See merge request !1756
      c7075a1a
    • Jarka Kadlecova's avatar
      Display comments for personal snippets · 959379de
      Jarka Kadlecova authored
      # Conflicts:
      #	app/controllers/snippets_controller.rb
      #	app/views/projects/notes/_note.html.haml
      959379de
    • Filipa Lacerda's avatar
      Merge branch 'master' into 2222-deploy-boards-polling · 3f7c317a
      Filipa Lacerda authored
      * master: (365 commits)
        Update CHANGELOG.md for 9.1.2
        Update CHANGELOG-EE.md for 9.1.2-ee
        Update CHANGELOG.md for 9.1.2
        Update CHANGELOG-EE.md for 9.1.2-ee
        Update CHANGELOG.md for 9.1.2
        Update CHANGELOG-EE.md for 9.1.2-ee
        Update CHANGELOG.md for 9.1.2
        Update CHANGELOG-EE.md for 9.1.2-ee
        Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrations
        Add AddColumnWithDefaultToLargeTable cop
        Rename AddColumnWithDefault to ReversibleAddColumnWithDefault
        Refactor the AddColumnWithDefault cop to use node matchers
        Change from .click -> .trigger('click') to make spec pass
        Enable RSpec/FilePath cop
        Address review comments for Geo spec
        Fix bug where Geo secondary Sidekiq cron jobs would not be activated if settings changed
        Remove warning about protecting Service Desk email from form
        Use new renamed markup method
        Fix commit search on some elasticsearch indexes
        Document the process of docs only changes
        ...
      3f7c317a
  2. 01 May, 2017 12 commits
  3. 29 Apr, 2017 6 commits
  4. 28 Apr, 2017 17 commits