Dmitriy Zaporozhets f00feb14ec Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service ...

Conflicts:
	app/controllers/projects/services_controller.rb

2015-03-02 15:22:31 -08:00

..

assets

Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fix

2015-03-02 14:28:21 -08:00

controllers

Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service

2015-03-02 15:22:31 -08:00

finders

Fix trending projects ordering

2015-02-18 22:23:24 -08:00

helpers

Fix broken project_url routing when protected branches are accessed with an empty repo

2015-03-01 20:26:21 -08:00

mailers

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

models

Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service

2015-03-02 15:22:31 -08:00

services

Merge branch 'autocomplete-mention-count' into 'master'

2015-02-27 07:08:23 +00:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge pull request #7473 from sodabrew/patch-1

2015-03-02 15:18:59 -08:00

workers

Add Irker service

2015-03-01 20:51:03 +01:00