Dmitriy Zaporozhets 4ab717ea6a Merge branch 'ldap_migration' ...

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

Conflicts:
	db/schema.rb

2015-04-13 17:18:02 +03:00

..

controllers

Render a 404 when RefsController#logs_tree gets an HTML request

2015-04-06 23:08:28 -04:00

factories

Added comment notification events to HipChat and Slack services.

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

features

Upon successful login, clear reset_password_token field

2015-04-08 16:06:56 -04: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

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

2015-04-13 14:10:25 +00: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:18:02 +03:00

mailers

Add ability to configure Reply-To address in gitlab.yml

2015-04-03 06:47:54 -07:00

models

Merge branch 'public-deploy-keys' into 'master'

2015-04-13 09:08:13 +00:00

requests/api

Modified lib/api/entities.rb to expose Project class tag_list property to the API

2015-04-03 04:35:12 -04:00

routing

Merge branch 'public-deploy-keys' into 'master'

2015-04-13 09:08:13 +00:00

services

Merge branch 'ci_fork' into 'master'

2015-04-09 13:41:37 +00:00

support

Merge pull request #9044 from tsigo/rs-git-template-env

2015-03-29 03:40:56 -07:00

tasks/gitlab

Merge branch 'fix-backup-spec-regexp' into 'master'

2015-04-03 08:49:47 +00:00

workers

CI forking: tests

2015-04-06 19:45:16 +03:00

factories_spec.rb

Updated rspec to rspec 3.x syntax

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

factories.rb

Add admin deploy keys tests.

2015-04-03 12:51:01 +02:00

spec_helper.rb

Add ActiveRecord::Migration.maintain_test_schema! to spec_helper

2015-03-27 15:31:16 -04:00