delta/gitlab/gitlab-ce.git/config, branch patch/fix-mergerequest-diff gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'rs-rails-routes' into 'master' 2016-03-23T18:33:48+00:00 Douwe Maan douwe@gitlab.com 2016-03-23T18:33:48+00:00 30246f1dc25125d712aab33032f5e14713f40594 Add special cases for built-in Rails routes in development See merge request !3369 

Add special cases for built-in Rails routes in development



See merge request !3369
 Fix an issue causing the Dashboard/Milestones page to be blank 2016-03-23T11:02:15+00:00 Rémy Coutable remy@rymai.me 2016-03-22T18:19:53+00:00 7dc16346bba174d6075cf438adcd70a5596ba935 






Add special cases for built-in Rails routes in development
2016-03-23T00:26:57+00:00

Robert Speicher
rspeicher@gmail.com

2016-03-23T00:26:57+00:00

19a2adfa0cd42d48600bb3036c6ff90d15bb41e6












Merge branch 'master' into 2489-soft-delete-issues
2016-03-21T18:32:37+00:00

Zeger-Jan van de Weg
zegerjan@gitlab.com

2016-03-21T18:32:37+00:00

6e5461c6ee8b408e35324b32c0b5ba99328ec763












Merge branch 'backport-ee-premailer' into 'master'

2016-03-21T10:46:37+00:00

Rémy Coutable
remy@rymai.me

2016-03-21T10:46:37+00:00

17de30f412b5eddaa080006b6dd2aae2bd2d5647


Backport premailer and diff changes from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

See merge request !3318





Backport premailer and diff changes from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

See merge request !3318






Soft delete issuables
2016-03-19T20:23:03+00:00

Zeger-Jan van de Weg
zegerjan@gitlab.com

2016-02-26T08:55:43+00:00

212e83bab3f1f9055f1321c3e934b4f4659250bf












Inline mailer CSS using premailer.
2016-03-19T19:04:10+00:00

Douwe Maan
douwe@selenight.nl

2016-01-28T16:54:13+00:00

a8aa59e96ef64a11073d7c84a9af93077f98bf8a

# Conflicts:
#	Gemfile.lock





# Conflicts:
#	Gemfile.lock







Merge remote-tracking branch 'origin/master' into remove-wip
2016-03-18T22:29:18+00:00

Rémy Coutable
remy@rymai.me

2016-03-18T22:29:18+00:00

cafa408b2521aa82d856581eb5d78d98114f1ab2












Fixes issue on dashboard issues
2016-03-18T15:18:06+00:00

Phil Hughes
me@iamphill.com

2016-03-16T19:14:31+00:00

d847db79cb6a99d9cfb6f4c57587887942965388

They would try to load JSON from a project even though it isn't a single project





They would try to load JSON from a project even though it isn't a single project







Added omniauth-auth0 Gem + Applicable Documentation.
2016-03-16T12:12:20+00:00

Daniel Carraro
daniel@blinkmobile.com.au

2016-02-29T05:37:27+00:00

d6caadd1d533eaacde8e7e315546e7c5425d60e6