1. 24 Jun, 2016 7 commits
    • Rémy Coutable's avatar
      Merge branch 'fix/gitlab-import-project-file-fix' into 'master' · 07ea22e5
      Rémy Coutable authored
      Fix temp file being deleted after the request while importing a GitLab project
      
      Fixes https://gitlab.com/gitlab-com/infrastructure/issues/151
      
      In production, the temporary uploaded file is getting deleted straight after the request so the Sidekiq worker is unable to find it in `/tmp`
      
      Also, improved erroring/logging of this situation.
      
      See merge request !4894
      07ea22e5
    • Yorick Peterse's avatar
      Merge branch 'refactor-rendering-redacting' into 'master' · ebd74925
      Yorick Peterse authored
      Support for rendering/redacting multiple documents
      
      See merge request !4828
      ebd74925
    • Yorick Peterse's avatar
      Support for rendering/redacting multiple documents · d470f3d1
      Yorick Peterse authored
      This commit changes the way certain documents are rendered (currently
      only Notes) and how documents are redacted. Previously both rendering
      and redacting would run on a per document basis. The result of this was
      that for every document we'd have to run countless queries just to
      figure out if we could display a set of links or not.
      
      This commit changes things around so that redacting Markdown documents
      is no longer tied into the html-pipeline Gem. This in turn allows it to
      redact multiple documents in a single pass, thus reducing the number of
      queries needed.
      
      In turn rendering issue/merge request notes has been adjusted to take
      advantage of this new setup. Instead of rendering Markdown somewhere
      deep down in a view the Markdown is rendered and redacted in the
      controller (taking the current user and all that into account). This has
      been done in such a way that the "markdown()" helper method can still be
      used on its own.
      
      This particular commit also paves the way for caching rendered HTML on
      object level. Right now there's an accessor method Note#note_html which
      is used for setting/getting the rendered HTML. Once we cache HTML on row
      level we can simply change this field to be a column and call a "save"
      whenever needed and we're pretty much done.
      d470f3d1
    • James Lopez's avatar
      fix params · c3b6eadc
      James Lopez authored
      c3b6eadc
    • James Lopez's avatar
      Fix tmp file being deleted after the request plus some cleanup and improved... · 46b89a27
      James Lopez authored
      Fix tmp file being deleted after the request plus some cleanup and improved erroring for this situation
      46b89a27
    • Stan Hu's avatar
      Merge branch 'fix-settings-spec' into 'master' · 4477dc24
      Stan Hu authored
      Fix settings_spec so that it can that run by itself
      
      Running `spec/settings_spec.rb` would fail because it would attempt to load `1_settings.rb`, which would reference `Rails`. This constant was not loaded without `spec_helper.rb`.
      
      
      See merge request !4893
      4477dc24
    • Stan Hu's avatar
      6ba627f7
  2. 23 Jun, 2016 33 commits