Dmitriy Zaporozhets 345e32d332 Merge branch 'sstanovnik-openssh_fix' into 'master' ...

Fix generating SSH key fingerprints with OpenSSH 6.8.

Replaces https://github.com/gitlabhq/gitlabhq/pull/9008.

Fixes gitlab-org/gitlab-ce#1289.

cc @jacobvosmaer

See merge request !519

2015-04-15 12:40:30 +00:00

..

controllers

Merge branch 'google-code-import' into 'master'

2015-04-15 06:53:42 +00: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

Import Google Code issue assignee when mapped.

2015-04-14 23:22:14 +02:00

helpers

Merge branch 'rs-link-to-performance' into 'master'

2015-04-14 07:33:09 +00:00

javascripts

Add trailing newline to all text files.

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

lib

Merge branch 'sstanovnik-openssh_fix' into 'master'

2015-04-15 12:40:30 +00:00

mailers

Set EmailsOnPush reply-to address to committer email when enabled.

2015-04-14 12:52:33 +02:00

models

Merge branch 'emailsonpush-hellip' into 'master'

2015-04-15 12:37:19 +00:00

requests/api

Track who created a group or project member.

2015-04-14 12:06:42 +02: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

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

Merge branch 'rs-remove-invalid-key-factories' into 'master'

2015-04-14 07:33:55 +00:00

spec_helper.rb

Add ActiveRecord::Migration.maintain_test_schema! to spec_helper

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