gitlabhq/app
Sebastian Ziebell 61cfa2a7a6 Merge branch 'master' into fixes/api
Conflicts:
	lib/api/projects.rb
2013-03-05 22:29:49 +01:00
..
assets reduce letter-spacing for top nav 2013-03-05 17:28:13 +02:00
contexts created-by-me filter for issues inside project. Fixed global project.issues order 2013-02-28 17:46:28 +02:00
controllers Merge pull request #3143 from Undev/state-machine-3 2013-03-05 05:38:16 -08:00
decorators fix decorate calls on collections after draper update 2013-03-01 15:24:59 +02:00
helpers tree_heleper: concat html only if present. Avoid nil exception 2013-03-05 17:15:20 +02:00
mailers Add a delay for sending emails 2013-02-01 17:04:41 +02:00
models Merge branch 'master' into fixes/api 2013-03-05 22:29:49 +01:00
observers Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1 2013-03-05 16:48:18 +02:00
services Merge pull request #3101 from tsl0922/master 2013-02-27 10:48:14 -08:00
uploaders skip protection to aws3 2013-02-15 09:49:35 +02:00
views Merge pull request #2015 from elvanja/commits-group-and-sort-by-date-desc 2013-03-05 06:40:13 -08:00
workers Move git post push logic to service 2013-02-25 21:21:38 +02:00