• Lin Jen-Shin's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-14 · 5f560438
    Lin Jen-Shin authored
    * upstream/master: (41 commits)
      Update test description to reflect behaviour
      Revert "Merge branch 'revert-2c879643' into 'master'"
      Add changelog entry
      Instrument Ability
      Update tests to cover removal of inactive tokens table
      Remove inactive tokens table
      Fix spacing in sidebar
      Use shared protected tag views for CE-partials
      Use shared protected branches views for CE-partials
      Fixed typo
      Handle nil BroadcastMessage.current in the views
      Handle case when BroadcastMessage.current is nil
      Update the mysql2 gem to v0.4.5
      Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set
      Increase width of dropdown menus automatically up to 500 px
      Indirectly migrate count_commits_between to Gitaly
      More Gitaly annotations
      Add more notes about developer seeds
      missed one...
      Move find file URL out of global variable
      ...
    5f560438
settings_spec.rb 2.7 KB