Dmitriy Zaporozhets 16b9ff5087 Merge branch 'ldap_migration' ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb

2015-04-13 17:19:21 +03:00

..

controllers

Merge branch 'github-org-repos' into 'master'

2015-03-12 17:13:25 +00:00

factories

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08:00

features

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

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

finders

Updated rspec to rspec 3.x syntax

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

fixtures

Add trailing newline to all text files.

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

helpers

Use project_member instead of team_member.

2015-03-15 13:50:38 +01:00

javascripts

Add trailing newline to all text files.

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

lib

Merge branch 'ldap_migration'

2015-04-13 17:19:21 +03:00

mailers

replace images in emails with inline images

2015-03-12 09:26:06 +01:00

models

Delete deploy key when last connection to a project is destroyed.

2015-03-17 14:55:43 +01:00

requests/api

Enforce restricted visibilities for snippets

2015-03-08 17:57:08 -06:00

routing

Use project_member instead of team_member.

2015-03-15 13:50:38 +01:00

services

Merge branch 'issue_subscription' into 'master'

2015-03-17 16:45:04 +00: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

Prevent gitlab-shell character encoding issues by receiving its changes as raw data.

2015-03-15 16:52:22 +01:00

factories_spec.rb

Updated rspec to rspec 3.x syntax

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

factories.rb

Remove unneeded password_confirmation from seed.

2014-12-28 14:42:15 +01:00

spec_helper.rb

Updated rspec to rspec 3.x syntax

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