Robert Speicher 5423e6e2d5 Merge branch 'zj-workhorse-format-patch' into 'master' ... Workhorse to serve email diffs See merge request !4590		2016-06-29 02:26:38 +00:00
..
config	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
controllers	Merge branch 'zj-workhorse-format-patch' into 'master'	2016-06-29 02:26:38 +00:00
factories	Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project	2016-06-20 14:04:14 +00:00
features	Add specs	2016-06-28 21:35:42 -04:00
finders	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
fixtures	Show proper image ID on registry page	2016-06-21 13:08:10 +02:00
helpers	Remove Haml helpers from the visibility level spec.	2016-06-22 16:10:26 -06:00
initializers	Fix settings_spec so that it can that run by itself	2016-06-23 22:26:33 -07:00
javascripts	Merge branch 'emoji-menu-stick-search' into 'master'	2016-06-27 18:03:08 +00:00
lib	Use clock_gettime for all performance timestamps	2016-06-28 17:51:25 +02:00
mailers	Fallback to group's owners/masters when a project has none	2016-06-20 12:10:37 +02:00
models	Merge remote-tracking branch 'dev/master'	2016-06-27 18:39:42 -04:00
requests	Improve commit builds API endpoint RESTful behavior	2016-06-28 12:22:31 +02:00
routing	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
services	Merge branch 'fix-18997' into 'master'	2016-06-27 18:43:12 +00:00
support	support cgi style options, such as erb?parent=json	2016-06-27 14:17:49 -07:00
tasks/gitlab	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
views
workers	Unify check branch name exist	2016-06-20 21:44:21 +02:00
factories_spec.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
rails_helper.rb
spec_helper.rb	Enable Knapsack only in CI environment	2016-06-08 11:43:13 +02:00
teaspoon_env.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00