1. 28 Jan, 2017 6 commits
    • Mike Greiling's avatar
      fix duplicate data-toggle attribute · 3ee67bcf
      Mike Greiling authored
      3ee67bcf
    • Mike Greiling's avatar
      update rake tasks · abb122a4
      Mike Greiling authored
      abb122a4
    • Mike Greiling's avatar
      fix frontend tests · 7c5d4942
      Mike Greiling authored
      7c5d4942
    • Mike Greiling's avatar
      Merge branch 'master' into go-go-gadget-webpack · c454dec1
      Mike Greiling authored
      * master: (33 commits)
        Improved code style on the issue_sidebar_spec.rb
        add CHAGELOG.md entry for !8831
        remove assets:compile step from relative_url docs
        update scripts and docs to reference the newly namespaced rake task
        namespace assets rake tasks to gitlab:assets:*
        correct gzip files if they exist as well
        automatically correct CSS urls on assets:precompile
        remove hard-coded assets path for ace editor modules
        Fixed cancel button in the services form not redirecting back to the integrations settings view
        Fix search bar search param encoding
        Fix a transient failure in the `Explore::ProjectsController` spec
        Fix filtering with multiple words
        Fix project name label's for reference in project settings
        Fixed merge request tabs extra margin
        Don't call `#uniq` on a relation
        Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/
        Move ApplicationSetting DEFAULTS to `.defaults` instead
        Move a begin/rescue clause to ApplicationSetting.expire
        Use badge partial as single source of truth instead of having 2 partials doing the same
        Changes after review
        ...
      c454dec1
    • Mike Greiling's avatar
      a5f79344
    • Mike Greiling's avatar
      Merge branch 'master' into go-go-gadget-webpack · 69e4072f
      Mike Greiling authored
      * master: (389 commits)
        Document "No gems fetched from git repositories" policy [ci skip]
        Typos
        Small gramatical tweaks
        Typos
        Added PHP & NPM doc
        Use `:empty_project` where possible in request specs
        Add caching of droplab ajax requests
        Use `:empty_project` where possible in model specs
        Revert 3f17f29a
        Remove unused js response from refs controller
        Add MR id to changelog entry
        fixed small mini pipeline graph line glitch
        Prevent form to be submitted twice
        Fix Error 500 when repositories contain annotated tags pointing to blobs
        Fix /explore sorting (trending)
        Simplify wording in "adding an image" docs
        Remove "official merge window" from CONTRIBUTING.md [ci skip]
        Update repository check documentation
        Fixed flexbox and wrap issues
        Update two_factor_authentication.md
        ...
      69e4072f
  2. 27 Jan, 2017 34 commits