Robert Speicher dad406da23 Merge remote-tracking branch 'origin/master'

2016-07-07 18:40:29 -04:00

..

config

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

controllers

Revert "Merge branch 'issue_3946' into 'master' "

2016-07-07 18:25:05 -04:00

factories

Merge branch 'new-diff-notes' into 'master'

2016-07-07 20:45:03 +00:00

features

Merge branch '18627-wildcard-branch-protection' into 'master'

2016-07-07 22:37:30 +00:00

finders

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

fixtures

Display new diff notes and allow creation through the web interface

2016-07-06 18:51:00 -04:00

helpers

Represent DiffRefs as proper class instead of tuple array

2016-07-06 18:50:58 -04:00

initializers

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

javascripts

Merge branch 'emoji-menu-stick-search' into 'master'

2016-06-27 18:03:08 +00:00

lib

Merge branch '18627-wildcard-branch-protection' into 'master'

2016-07-07 22:37:30 +00:00

mailers

Represent DiffRefs as proper class instead of tuple array

2016-07-06 18:50:58 -04:00

models

Merge branch '18627-wildcard-branch-protection' into 'master'

2016-07-07 22:37:30 +00:00

requests

Rename MergeRequest methods that return commits or shas to be more clear and consistent

2016-07-06 18:50:58 -04:00

routing

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

services

Add comment with diff to DiffPositionUpdateService spec

2016-07-07 16:14:57 -04:00

support

Improve the error message displayed when branch creation fails.

2016-07-05 11:05:16 +05:30

tasks/gitlab

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

views

Do not show build retry link when build is active

2016-06-30 11:06:19 +02:00

workers

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

factories_spec.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Remove coveralls lines

2016-06-30 19:52:36 +02:00

teaspoon_env.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00