Douwe Maan 6a8359f3d3 Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits' ...

# Conflicts:
#	Gemfile.lock

2016-05-04 17:27:47 +02:00

..

assets

Merge branch 'dz-small-ui-fixes' into 'master'

2016-04-29 17:56:46 +00:00

controllers

Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'

2016-05-04 17:27:47 +02:00

finders

Prevent private snippets in public/internal projects from being leaked via API

2016-04-25 12:02:06 -07:00

helpers

Merge remote-tracking branch 'dev/master' into 'master'

2016-05-02 19:58:54 -04:00

mailers

Support e-mail notifications for comments on project snippets

2016-05-02 11:01:32 -07:00

models

Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'

2016-05-04 17:27:47 +02:00

services

Merge remote-tracking branch 'dev/master' into 'master'

2016-05-02 19:58:54 -04:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master'

2016-05-04 14:12:51 +00:00

workers

Merge branch 'create-wikis-during-check' into 'master'

2016-05-04 14:10:49 +00:00