Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml

2014-05-12 12:39:51 +03:00

..

controllers

Fix /:username.keys response content type

2014-03-20 19:09:14 +04:00

factories

Use last appearance settings. Show last edit date

2014-04-14 22:14:51 +03:00

features

Split feature tests out to different build job

2014-04-13 19:05:52 +02:00

finders

Serialize last_fetched_at as a string with seconds

2014-04-28 12:42:01 +02:00

fixtures

Ability to edit comments

2013-07-01 10:48:02 +01:00

helpers

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9

2014-05-12 12:39:51 +03:00

javascripts

Update jasmine gem to work with rails4

2013-12-10 16:03:24 +02:00

lib

Add support for Jira ticket mentions in format JIRA-123.

2014-05-06 19:51:56 +02:00

mailers

Fix notify specs

2014-05-09 09:46:23 +03:00

models

Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee

2014-04-22 11:58:11 +02:00

observers

Fix user_project observer test.

2014-04-03 16:35:33 +02:00

requests/api

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9

2014-05-12 12:39:51 +03:00

routing

Fixes to group route tests, thanks DZ

2014-04-15 10:40:37 +02:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8

2014-04-10 13:34:56 +03:00

support

Use ProjectWiki instead of GollumWiki in code

2014-04-09 14:35:58 +03:00

tasks/gitlab

Make backup version blocker test more robust

2014-02-28 12:11:43 +01:00

workers

Merge branch 'improve/mr_diff'

2014-01-23 14:38:23 +02:00

factories_spec.rb

Style changes from review with @randx

2013-07-17 22:48:03 -04:00

factories.rb

Merge pull request #6557 from tsigo/faster-merge-request-features

2014-03-19 14:45:15 +02:00

seed_project.tar.gz

Speed up features/notes_on_merge_requests_spec

2014-03-19 03:57:37 -04:00

spec_helper.rb

Remove Spork

2014-03-24 08:55:27 -04:00