gitlab-org--gitlab-foss/app
Luke "Jared" Bennett ef7001c9c6 Merge branch 'master' into 'balsalmiq-support'
# Conflicts:
#   spec/features/projects/commit/cherry_pick_spec.rb
#   spec/features/projects/environments/environment_spec.rb
2017-05-02 09:11:55 +00:00
..
assets Merge branch 'master' into 'balsalmiq-support' 2017-05-02 09:11:55 +00:00
controllers Merge branch 'dm-snippet-blob-viewers' into 'master' 2017-05-01 14:20:04 +00:00
finders Ability to filter merge requests by labels and milestones 2017-04-25 22:07:38 +02:00
helpers Show Raw button as Download for binary files 2017-04-30 14:06:21 -05:00
mailers Rename GitlabMarkdownHelper -> MarkupHelper 2017-04-27 13:22:17 +02:00
models Merge branch 'master' into 'balsalmiq-support' 2017-05-02 09:11:55 +00:00
policies Fix Rubocop CyclomaticComplexity offense 2017-04-26 16:38:34 +02:00
presenters
serializers Merge branch 'usage-ping-port' into 'master' 2017-04-19 14:48:31 +00:00
services Revert "Merge branch 'tc-no-todo-service-select' into 'master'" 2017-04-29 12:29:59 +00:00
uploaders
validators
views Merge branch 'master' into 'balsalmiq-support' 2017-05-02 09:11:55 +00:00
workers Update Carrierwave and fog-core 2017-05-01 20:15:16 +00:00