Jacob Schatz b3e4bc5911 resolves conflicts with new buttons

2015-12-23 17:05:29 -05:00

..

assets

resolves conflicts with new buttons

2015-12-23 17:05:29 -05:00

controllers

Merge branch 'improve_emoji_picker' into 'master'

2015-12-23 11:01:49 +00:00

finders

sort milestones by due_date

2015-12-03 08:53:34 -06:00

helpers

resolves conflicts with new buttons

2015-12-23 17:05:29 -05:00

mailers

Fixed Rubocop offenses

2015-12-15 00:53:52 -02:00

models

Use method that creates runners registration token

2015-12-23 11:45:17 +01:00

services

Backport JIRA service

2015-12-18 14:19:48 -06:00

uploaders

Expose artifacts path

2015-11-23 13:05:22 +01:00

validators

Inline Gitlab::Blacklist in NamespaceValidator

2015-12-07 16:57:26 -05:00

views

resolves conflicts with new buttons

2015-12-23 17:05:29 -05:00

workers

Migrate CI WebHooks and Emails to new tables

2015-12-10 16:04:08 +01:00