gitlab-org--gitlab-foss/app/models/ci
Grzegorz Bizon 4657c28777 Merge branch 'master' into fix/keep-artifacts-button-visibility
* master: (579 commits)

Conflicts:
	spec/models/build_spec.rb
2017-01-16 14:21:44 +01:00
..
build.rb Add method that checks for expiring build artifacts 2017-01-09 10:58:45 +01:00
pipeline.rb fix pipelines/index.html.haml merge conflict 2017-01-02 16:24:37 -07:00
runner.rb Remove redundant class_name and foreign_key overrides 2016-10-24 22:29:48 +02:00
runner_project.rb Remove redundant class_name and foreign_key overrides 2016-10-24 22:29:48 +02:00
stage.rb Add tests for stage API endpoint 2016-12-20 11:00:56 +01:00
trigger.rb Remove redundant class_name and foreign_key overrides 2016-10-24 22:29:48 +02:00
trigger_request.rb Remove redundant class_name and foreign_key overrides 2016-10-24 22:29:48 +02:00
variable.rb Use :maximum instead of :within for length validators with a 0..N range 2016-12-06 10:23:17 +01:00