Keith Pitt 4c7da578f2 Merge branch 'master' into buildbox-service ... Conflicts: app/models/project.rb		2014-10-08 16:33:53 +08:00
..
assets	Style merge request CI widget to match MR/Issue box	2014-10-07 15:11:18 +03:00
controllers	Merge pull request #7985 from cirosantilli/outdated-comment	2014-10-07 19:02:52 +02:00
finders	Improve formatting of app/finders/README.md	2014-10-07 22:39:45 +02:00
helpers	Merge pull request #7981 from cirosantilli/www-to-about	2014-10-08 09:46:51 +02:00
mailers	Fix adminarea and emails for new membership logic	2014-09-15 10:57:02 +03:00
models	Merge branch 'master' into buildbox-service	2014-10-08 16:33:53 +08:00
services	Add task lists to issues and merge requests	2014-10-05 22:15:27 -05:00
uploaders	…
views	Merge branch 'master' into buildbox-service	2014-10-08 16:33:53 +08:00
workers	Add parenthesis to function def with arguments.	2014-10-03 09:18:46 +02:00