1. 02 May, 2015 6 commits
    • Robert Speicher's avatar
      Merge branch 'rs-test-env-fixes' into 'master' · b3890749
      Robert Speicher authored
      Don't delete gitlab-test-fork folder after every test run
      
      72a7febe added a forked repository cloned to `tmp/tests/gitlab-test-fork` but because it wasn't added to the list of folders not to delete every run, it was being cloned every run and adding extraneous console output.
      
      See merge request !600
      b3890749
    • Robert Speicher's avatar
    • Robert Speicher's avatar
      Merge branch 'make-reply-to-work-everywhere' into 'master' · 703856c7
      Robert Speicher authored
      Make Reply-To config apply to change e-mail confirmation and other notifications sent through Devise
      
      Notifications sent through Devise were using the default From: address, and due to a broken test line nothing was actually being run.
      
      The only way to customize the Devise Reply-To field is to use a custom mailer. Moved the e-mail configuration out of the initializers to accommodate this.
      
      Closes #1556
      
      See merge request !596
      703856c7
    • Dmitriy Zaporozhets's avatar
      Merge branch 'you-get-a-title-and-you-get-a-title-and-everyone-gets-a-title' into 'master' · cfbff017
      Dmitriy Zaporozhets authored
      Add a page title to every page.
      
      ![You get a title, and you get a title; everyone gets a title!](https://i.imgflip.com/kvmq8.jpg)
      
      The `page_title` helper pushes the provided string at the end of the title, but because of the order that layouts are rendered in by ActionView, the result is always this:
      
      ```
      <title from view> |
      <title from as specified in the controller or by its layout> |
      <title from layouts/_head>
      ```
      
      For example: `Merge Requests | GitLab.org / Gitlab Community Edition | GitLab`.
      
      All a developer needs to know is to put a `page_title` call describing the page in question at the start of every template.
      
      To get everything where I wanted it to go without too much duplication, I had to make some changes around layouts, sidebars and controllers.
      
      See merge request !593
      cfbff017
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-more-pipeline-filters' into 'master' · 812c7a85
      Dmitriy Zaporozhets authored
      More HTML::Pipeline filters
      
      The big part of this MR is a feature that is intended to test the entire Markdown-parsing process from beginning to end. See `spec/support/markdown_feature.rb` and `spec/features/markdown_spec.rb`.
      
      One big thing this MR fixes is not being able to type a `<` or `>` anywhere. It now gets properly escaped.
      
      This MR also adds three more custom HTML::Pipeline filters:
      
      ### AutolinkFilter
      
      Similar to the built-in Autolink filter in that it still uses Rinku for standard http and ftp links, but then does some further processing to allow auto-linking of any URI scheme. See internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2239
      
      ### SanitizationFilter
      
      Created a simple custom SanitizationFilter that sub-classes the default one and adds our custom whitelisting.
      
      ### TableOfContentsFilter
      
      Adds the anchor links to each header. This removes some processing from our Redcarpet renderer.
      
      Closes #800, #1015, #1528, #1549
      
      Closes GitHub [8535](https://github.com/gitlabhq/gitlabhq/issues/8535)
      
      See merge request !584
      812c7a85
    • Stan Hu's avatar
      Make Reply-To config apply to change e-mail confirmation and other notifications · 4dda17a5
      Stan Hu authored
      sent through Devise
      
      Fix test case that was passing due to a broken `around` statement.
      
      Closes #1556
      4dda17a5
  2. 01 May, 2015 4 commits
  3. 30 Apr, 2015 30 commits