Dmitriy Zaporozhets 71f6143552 Merge branch 'master' into new-sidebar ...

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

Conflicts:
	app/controllers/snippets_controller.rb

2015-04-23 12:08:03 +03:00

..

controllers

Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'

2015-04-20 09:43:01 +00:00

factories

Added comment notification events to HipChat and Slack services.

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

features

Re-fix image rendering for help pages

2015-04-15 12:45:31 -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-issue-2257' into 'master'

2015-04-22 13:04:46 +00:00

javascripts

Typo: Issueable -> Issuable

2015-04-18 15:20:15 -04:00

lib

Add Gitlab::Markdown::EmojiFilter

2015-04-21 12:53:42 -04: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

Merge pull request #8831 from bladealslayer/fix/api-user-tests

2015-04-22 16:55:27 +05:00

routing

Fix snippet test

2015-04-22 20:12:52 +03:00

services

Fix notification service spec.

2015-04-15 21:09:14 +02:00

support

Add more tests for cross-project references

2015-04-20 13:01:46 -04: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