Dmitriy Zaporozhets aec8c717a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	Gemfile
	VERSION
	app/models/service.rb

2015-03-18 10:33:31 -07:00

..

controllers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-18 10:33:31 -07:00

factories

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-11 18:41:41 -07:00

features

Merge branch 'atom-xhtml-squashed' into 'master'

2015-03-17 08:38:38 +00:00

finders

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

fixtures

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

helpers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

javascripts

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

lib

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

mailers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-18 10:33:31 -07:00

requests/api

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

routing

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-17 10:19:31 -07:00

support

This MR extends the commit calendar so it searches for commits made with every email address the user has associated with his account.

2015-03-09 21:43:54 -07:00

tasks/gitlab

Revert "Merge branch 'backup-permissions' into 'master'"

2015-03-16 23:51:46 -07:00

workers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

factories_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

factories.rb

Group level web hooks: tests

2015-03-12 20:46:10 +02:00

spec_helper.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00