delta/gitlab/gitlab-ce.git/app/models/project.rb, branch patch/fix-mergerequest-diff gitlab.com: gitlab-org/gitlab-ce.git Make sure we get only two returns 2016-03-23T12:22:09+00:00 Lin Jen-Shin godfat@godfat.org 2016-03-23T12:22:09+00:00 ecc060d701968b75009f47a3b7ac5b727022782c 






Merge branch 'master' into issue_12658
2016-03-21T22:22:21+00:00

Douwe Maan
douwe@selenight.nl

2016-03-21T22:22:21+00:00

ae7b2ef62cdf61c990f914d776a6fdfc2bc49fa2

# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb





# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb







Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/safe-import-url
2016-03-21T17:52:55+00:00

James Lopez
james@jameslopez.es

2016-03-21T17:52:55+00:00

cae864a12e3c99d642fb812fff3941e9f5271f95












update safe_import_url to prevent tokens to be showed by the UI
2016-03-21T17:52:21+00:00

James Lopez
james@jameslopez.es

2016-03-21T17:52:21+00:00

4196ee0661d705c81ca49294926bfaa28d725119












Fix spec
2016-03-20T23:42:30+00:00

Douwe Maan
douwe@selenight.nl

2016-03-20T23:42:30+00:00

b689e2c0e0d0ad4303d99150c843ef914f1fd516












Fix specs
2016-03-20T22:26:58+00:00

Douwe Maan
douwe@selenight.nl

2016-03-20T22:26:58+00:00

45e8650c4f987f0a25d829bf8ac189b023f1eaa3












Fix some specs
2016-03-20T21:55:08+00:00

Douwe Maan
douwe@selenight.nl

2016-03-20T21:55:08+00:00

7c51d5efecdad1a7f52ffecdf57c86b7b90ca166












Tweaks, refactoring, and specs
2016-03-20T20:04:07+00:00

Douwe Maan
douwe@selenight.nl

2016-03-20T20:03:53+00:00

8db1292139cfdac4c29c03b876b68b9e752cf75a












Merge branch 'master' into issue_12658
2016-03-20T13:57:25+00:00

Douwe Maan
douwe@selenight.nl

2016-03-20T13:57:25+00:00

2eb19ea3ea36916bbea72a8ccab3e6d15f602ac9












Cache output of Repository#exists?
2016-03-19T20:54:08+00:00

Yorick Peterse
yorickpeterse@gmail.com

2016-03-18T14:31:19+00:00

68a4c98f5074bd34f0178f2f967153c8d5c71237

This caches the output of Repository#exists? in Redis while making sure
it's flushed properly when creating new repositories, deleting them,
etc.

For the ProjectWiki tests to work I had to make ProjectWiki#create_repo!
public as testing private methods in RSpec is a bit of a pain.





This caches the output of Repository#exists? in Redis while making sure
it's flushed properly when creating new repositories, deleting them,
etc.

For the ProjectWiki tests to work I had to make ProjectWiki#create_repo!
public as testing private methods in RSpec is a bit of a pain.