delta/gitlab/gitlab-ce.git/Gemfile, branch google-code-fixes

Ignore submodules that are defined in .gitmodules but are checked in as directories.

2015-04-17T18:51:12+00:00

Update gitlab_git to ignore invalid lines in .gitmodules.

2015-04-17T10:23:28+00:00

Merge branch 'reference-access-control' into 'master'

2015-04-13T14:10:25+00:00

Only allow users to reference groups, projects, issues, MRs, commits they have access to.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.

See merge request !1742

Update redcarpet to 3.2.3

2015-04-09T21:28:45+00:00

Allow byebug to be used in test.

2015-04-03T16:02:16+00:00

Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection.

2015-03-31T12:17:20+00:00

Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff being rendered as error.

2015-03-31T10:37:14+00:00

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2015-03-29T10:32:28+00:00

Merge branch 'fix-plain-diffs' into 'master'

2015-03-29T10:32:27+00:00

Remove the email patches link for merge commits

Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches.  This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit.  Together these changes should prevent the 500 errors described in the issue.

cc @sytse

See merge request !1737

update acts-as-taggable-on

2015-03-28T23:39:32+00:00