Commit graph

11 commits

Author SHA1 Message Date
Marin Jankovski
5613592727 If action link is not found, return nil. 2015-11-25 13:53:02 +01:00
Stefan Tatschner
f736721c5b Replace Rugments with Rouge
I have mainly created the rugments fork for the purpose of improving
gitlab's highlighting. Nowadays IMO it works way better than the old
highlight.js solution. But the development is stuck on my side because
of a couple of personal reasons:

  * I have finished my studies; last months I was writing my master
    thesis. So there was a huge time problem. I am sorry for that.

  * I had to move to Munich due to getting a (paid) job. Searching a
    flat here is horrible... :)

  * Last but not least, maintaining the same code base in two seperate
    projects is a mess.

I have decided to switch back to rouge due to several reasons:

  * In the beginning I was quite motivated, but since I start
    working on my new job next week, the best solution IMO is
    switching back to upstream rouge.

  * Rouge is continously improving:
    https://github.com/jneen/rouge/blob/master/CHANGELOG.md
    http://rouge.jneen.net/

  * There should be absolutely no regressions with this change. Most
    likely this pull request will almost fix some minor bugs.

  * One less gem in gitlab is a good thing. since Gitlab is quite a
    huge bundle of gems. Reducing complexity should be a major
    milestone.

Thanks a lot to @stanhu and @jneen for the review!
2015-07-29 07:40:58 +02:00
Vinnie Okada
af428b1259 Fill in email on the new password form 2015-05-16 14:03:18 -06:00
Vinnie Okada
0bfab084a8 Explain reset token expiration in emails
Tell new users when their password reset token expires and provide a
link to get a new one.
2015-05-16 14:03:07 -06:00
Hannes Rosenögger
8e9fbd847d Revert "Merge branch 'fix_email_images' into 'master'"
This reverts commit d66148ef39, reversing
changes made to cdb64a81a8.

This change needed to be reverted,
because not enough email clients support inline images.
2015-04-13 12:34:47 +02:00
Douwe Maan
08eac512bd Move EmailsOnPush highlight CSS inline instead of being in every notification email. 2015-03-31 12:36:36 +02:00
Hannes Rosenögger
3c7e0f45c2 replace images in emails with inline images
This adds the functionality of replacing all images that were uploaded
to gitlab with inline images(base64) in emails.
This change fixes the broken images in emails that 7.8 introduced
2015-03-12 09:26:06 +01:00
Dmitriy Zaporozhets
4f1d1fc51b Convert hashes to ruby 1.9 style 2015-02-02 19:30:09 -08:00
Hannes Rosenögger
e460e04e16 Add Diff syntax colors for email-on-push notifications 2015-01-17 19:19:28 +01:00
Marin Jankovski
857852ce04 Set action on issue/mr creation mail. 2014-11-12 11:59:57 +01:00
Marin Jankovski
af15447867 Create emails helper for actions links. 2014-11-11 16:09:58 +01:00