James Lopez 778d72664f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export ...

# Conflicts:
#	app/models/ci/pipeline.rb

2016-06-16 13:04:00 +02:00

..

build.rb

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

pipeline.rb

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export

2016-06-16 13:04:00 +02:00

runner_project.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

runner.rb

Enable Style/NegatedIf Rubocop cop

2016-05-30 13:53:25 +02:00

trigger_request.rb

Rename commit to pipeline in TriggerRequest

2016-06-09 17:57:07 +02:00

trigger.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

variable.rb

Upgrade attr_encrypted and encryptor

2016-05-30 13:51:21 -06:00