2b6307f6ad 
								
							 
						 
						
							
							
								
								Enable RuboCop Style/RegexpLiteral  
							
							
							
						 
						
							2018-02-01 02:06:07 +09:00  
				
					
						
							
							
								 
						
							
								67c7e0fc5d 
								
							 
						 
						
							
							
								
								Fail jobs if its dependency is missing  
							
							
							
						 
						
							2017-12-06 15:53:59 +09:00  
				
					
						
							
							
								 
						
							
								07c7ba1bf4 
								
							 
						 
						
							
							
								
								Allow to drop jobs for deleted projects  
							
							
							
						 
						
							2017-11-27 11:56:15 +01:00  
				
					
						
							
							
								 
						
							
								164b1df590 
								
							 
						 
						
							
							
								
								Extract ensure stage service from commit status class  
							
							
							
						 
						
							2017-11-06 11:04:09 +01:00  
				
					
						
							
							
								 
						
							
								e2828a6067 
								
							 
						 
						
							
							
								
								Use existing pipeline stage if stage already exists  
							
							
							
						 
						
							2017-11-06 11:04:09 +01:00  
				
					
						
							
							
								 
						
							
								503f213670 
								
							 
						 
						
							
							
								
								Make sure that every job has a stage assigned  
							
							
							
						 
						
							2017-11-06 11:04:09 +01:00  
				
					
						
							
							
								 
						
							
								38d9b4d77d 
								
							 
						 
						
							
							
								
								Use script_failure. Add runner_system_failure. Improve spec.  
							
							
							
						 
						
							2017-09-05 15:10:34 +09:00  
				
					
						
							
							
								 
						
							
								68f6c61cf6 
								
							 
						 
						
							
							
								
								- Allow runner API to pass failure_reason  
							
							... 
							
							
							
							- Fix spec 
							
						 
						
							2017-09-05 14:30:28 +09:00  
				
					
						
							
							
								 
						
							
								1d7c039072 
								
							 
						 
						
							
							
								
								Fix enum lists  
							
							
							
						 
						
							2017-09-05 14:30:28 +09:00  
				
					
						
							
							
								 
						
							
								b1af1f268b 
								
							 
						 
						
							
							
								
								Fix enum wording  
							
							
							
						 
						
							2017-09-05 14:30:28 +09:00  
				
					
						
							
							
								 
						
							
								dcf09d1144 
								
							 
						 
						
							
							
								
								Implement `failure_reason` on `ci_builds`  
							
							
							
						 
						
							2017-09-05 14:30:28 +09:00  
				
					
						
							
							
								 
						
							
								865de49b08 
								
							 
						 
						
							
							
								
								Update related stage status when job status is changed  
							
							
							
						 
						
							2017-07-24 11:34:01 +02:00  
				
					
						
							
							
								 
						
							
								8657d5dd8a 
								
							 
						 
						
							
							
								
								Do not implement CI/CD job to stage association yet  
							
							
							
						 
						
							2017-07-24 11:33:01 +02:00  
				
					
						
							
							
								 
						
							
								c7a7ef044c 
								
							 
						 
						
							
							
								
								Use a new stage_id reference to a persisted stage  
							
							
							
						 
						
							2017-07-20 12:56:27 +02:00  
				
					
						
							
							
								 
						
							
								b3ee172b4e 
								
							 
						 
						
							
							
								
								Add a workaround for a tmp job -> stage relation  
							
							... 
							
							
							
							We still didn't migrate `ci_builds.stage_id`, so we can't use a
belongs_to association. We also have `ci_builds.stage` string attribute,
that we need to phase out in favor of `ci_stages.name`. 
							
						 
						
							2017-07-04 16:41:33 +02:00  
				
					
						
							
							
								 
						
							
								93b555af85 
								
							 
						 
						
							
							
								
								Handle legacy jobs without name  
							
							... 
							
							
							
							Older pipelines can contain jobs without a name, in which case
'nameless' is used right now, so we can properly still handle other
actions on these jobs.
Fixes  gitlab-org/gitlab-ce#33403  
							
						 
						
							2017-06-13 11:19:45 +02:00  
				
					
						
							
							
								 
						
							
								6bea29649e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/import-commit-status-issue' into 'master'  
							
							... 
							
							
							
							Ignore commit status name validation on importing
Closes  #33490 
See merge request !12039  
							
						 
						
							2017-06-12 15:38:09 +00:00  
				
					
						
							
							
								 
						
							
								452202e36d 
								
							 
						 
						
							
							
								
								Improve Job detail view to make it refreshed in real-time instead of reloading  
							
							
							
						 
						
							2017-06-12 09:20:19 +00:00  
				
					
						
							
							
								 
						
							
								eaf71fc963 
								
							 
						 
						
							
							
								
								ignore name validation on importing  
							
							
							
						 
						
							2017-06-12 10:11:08 +02:00  
				
					
						
							
							
								 
						
							
								79380fe5fb 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/gb/persist-pipeline-stages  
							
							... 
							
							
							
							* master: (524 commits)
  Improve user experience around slash commands in instant comments
  Fix LFS timeouts when trying to save large files
  retryable? is now available for CommitStatus
  Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables"
  Fix test failures
  Add slugify project path to CI enviroment variables
  Fixed typo: craeted -> created
  32118 Make New environment empty state btn lowercase
  Expose import_status in Projects API
  32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon
  Fix test failures
  Allow manual bypass of auto_sign_in_with_provider
  Fix keys seed
  Allow users to be hard-deleted from the API
  fixup some classnames and media queries
  Enable the Style/PreferredHashMethods cop
  Lint our factories creation in addition to their build
  Don’t schedule workers from inside transactions
  Allow scheduling from after_commit hooks
  Forbid Sidekiq scheduling in transactions
  ...
Conflicts:
	app/serializers/pipeline_entity.rb
	db/schema.rb
	spec/factories/ci/stages.rb
	spec/lib/gitlab/import_export/safe_model_attributes.yml
	spec/services/ci/create_pipeline_service_spec.rb
	spec/spec_helper.rb 
							
						 
						
							2017-06-05 12:51:59 +02:00  
				
					
						
							
							
								 
						
							
								9ccb289aa1 
								
							 
						 
						
							
							
								
								Merge branch 'zj-job-view-goes-real-time' into 'master'  
							
							... 
							
							
							
							Initial implementation for real time job view
Closes  #31397 
See merge request !11651  
							
						 
						
							2017-06-05 10:24:57 +00:00  
				
					
						
							
							
								 
						
							
								1709e5cf87 
								
							 
						 
						
							
							
								
								retryable? is now available for CommitStatus  
							
							
							
						 
						
							2017-06-04 12:44:00 +02:00  
				
					
						
							
							
								 
						
							
								e4eac1fff1 
								
							 
						 
						
							
							
								
								Don’t schedule workers from inside transactions  
							
							
							
						 
						
							2017-06-02 11:43:32 -05:00  
				
					
						
							
							
								 
						
							
								fe0b2f81c7 
								
							 
						 
						
							
							
								
								Refine implementation of pipeline stage seeds  
							
							
							
						 
						
							2017-06-02 12:16:11 +02:00  
				
					
						
							
							
								 
						
							
								336635f283 
								
							 
						 
						
							
							
								
								Test the ExpireJobCacheWorker and related changes  
							
							... 
							
							
							
							These were untested by the cherry picked commit. 
							
						 
						
							2017-05-22 22:07:11 +02:00  
				
					
						
							
							
								 
						
							
								da0c543e28 
								
							 
						 
						
							
							
								
								Add MISSING e-tag refresh of resource for Job, and Pipeline Graph  
							
							
							
						 
						
							2017-05-22 22:07:11 +02:00  
				
					
						
							
							
								 
						
							
								81df0034f4 
								
							 
						 
						
							
							
								
								Merge branch 'retried-in-database-mysql' into 'master'  
							
							... 
							
							
							
							Retried in database
Closes  #25737 
See merge request !11115  
							
						 
						
							2017-05-10 22:07:05 +00:00  
				
					
						
							
							
								 
						
							
								f09dcbd9bd 
								
							 
						 
						
							
							
								
								Make retried to be nullable  
							
							
							
						 
						
							2017-05-09 20:09:41 +02:00  
				
					
						
							
							
								 
						
							
								f2a4420d66 
								
							 
						 
						
							
							
								
								Store retried in database for CI builds  
							
							
							
						 
						
							2017-05-07 22:43:53 +02:00  
				
					
						
							
							
								 
						
							
								702b291f81 
								
							 
						 
						
							
							
								
								remove gl_project_id for I/E version update  
							
							
							
						 
						
							2017-05-02 14:55:32 +02:00  
				
					
						
							
							
								 
						
							
								057c0d7a5c 
								
							 
						 
						
							
							
								
								Also track auto-cancelling in jobs, detail:  
							
							... 
							
							
							
							Not only tracking auto-cancelling in pipelines,
we'll also track this in jobs because pipelines
could be retried and the information would get lost
when this happened. Also erase auto-cancelling
relation for pipelines when they're retried. 
							
						 
						
							2017-04-06 21:32:56 +08:00  
				
					
						
							
							
								 
						
							
								bb910c3b46 
								
							 
						 
						
							
							
								
								Make CI build to use optimistic locking only on status change  
							
							
							
						 
						
							2017-03-28 17:50:28 +02:00  
				
					
						
							
							
								 
						
							
								12dd5ac221 
								
							 
						 
						
							
							
								
								All CI offline migrations  
							
							
							
						 
						
							2017-03-17 23:06:11 +00:00  
				
					
						
							
							
								 
						
							
								c4d5b231ed 
								
							 
						 
						
							
							
								
								Ignore optional  actions when calculating warnings  
							
							
							
						 
						
							2017-03-06 14:43:32 +01:00  
				
					
						
							
							
								 
						
							
								305064a639 
								
							 
						 
						
							
							
								
								Fix invalid description in commit status specs  
							
							
							
						 
						
							2017-03-06 12:43:29 +01:00  
				
					
						
							
							
								 
						
							
								ac5bd3b73c 
								
							 
						 
						
							
							
								
								Reinstitute a core `manual` status for manual actions  
							
							
							
						 
						
							2017-03-06 10:04:04 +01:00  
				
					
						
							
							
								 
						
							
								dd24091191 
								
							 
						 
						
							
							
								
								Add support for blocking actions to CI/CD pipeline  
							
							
							
						 
						
							2017-03-06 10:04:04 +01:00  
				
					
						
							
							
								 
						
							
								79ea01bfaf 
								
							 
						 
						
							
							
								
								Refactor code related to pipeline blocking actions  
							
							
							
						 
						
							2017-03-06 10:04:04 +01:00  
				
					
						
							
							
								 
						
							
								be039d22d7 
								
							 
						 
						
							
							
								
								Make manual actions blocking  
							
							
							
						 
						
							2017-03-06 10:04:04 +01:00  
				
					
						
							
							
								 
						
							
								56de781a2c 
								
							 
						 
						
							
							
								
								Revert "Enable Style/DotPosition"  
							
							... 
							
							
							
							This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.
# Conflicts:
#	.rubocop.yml
#	.rubocop_todo.yml
#	lib/gitlab/ci/config/entry/global.rb
#	lib/gitlab/ci/config/entry/jobs.rb
#	spec/lib/gitlab/ci/config/entry/factory_spec.rb
#	spec/lib/gitlab/ci/config/entry/global_spec.rb
#	spec/lib/gitlab/ci/config/entry/job_spec.rb
#	spec/lib/gitlab/ci/status/build/factory_spec.rb
#	spec/lib/gitlab/incoming_email_spec.rb 
							
						 
						
							2017-02-23 09:33:19 -06:00  
				
					
						
							
							
								 
						
							
								1fe7501b49 
								
							 
						 
						
							
							
								
								Revert "Prefer leading style for Style/DotPosition"  
							
							... 
							
							
							
							This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b. 
							
						 
						
							2017-02-23 09:33:05 -06:00  
				
					
						
							
							
								 
						
							
								b3ff48c9a1 
								
							 
						 
						
							
							
								
								Move up delegate calls  
							
							
							
						 
						
							2017-02-23 09:32:42 -06:00  
				
					
						
							
							
								 
						
							
								206953a430 
								
							 
						 
						
							
							
								
								Prefer leading style for Style/DotPosition  
							
							
							
						 
						
							2017-02-23 09:32:22 -06:00  
				
					
						
							
							
								 
						
							
								5cd9c7c6ea 
								
							 
						 
						
							
							
								
								Enable Rails/Validation  
							
							
							
						 
						
							2017-02-23 09:31:57 -06:00  
				
					
						
							
							
								 
						
							
								3dadf306dd 
								
							 
						 
						
							
							
								
								Enable Style/DotPosition  
							
							
							
						 
						
							2017-02-23 09:31:56 -06:00  
				
					
						
							
							
								 
						
							
								346a7c696a 
								
							 
						 
						
							
							
								
								Add after_stage scope to commit status class  
							
							
							
						 
						
							2017-02-14 11:38:19 +01:00  
				
					
						
							
							
								 
						
							
								ffcf3c6858 
								
							 
						 
						
							
							
								
								Skip job only when canceling the pipeline it belongs to  
							
							
							
						 
						
							2017-02-13 15:11:21 +01:00  
				
					
						
							
							
								 
						
							
								008f22cd82 
								
							 
						 
						
							
							
								
								Fix pipeline specs related to canceling builds  
							
							
							
						 
						
							2017-02-13 15:11:21 +01:00  
				
					
						
							
							
								 
						
							
								a70a83cf29 
								
							 
						 
						
							
							
								
								Skip buils that were canceled but not started yet  
							
							
							
						 
						
							2017-02-13 15:11:21 +01:00  
				
					
						
							
							
								 
						
							
								1c5a506588 
								
							 
						 
						
							
							
								
								rename sort method  
							
							
							
						 
						
							2017-01-02 11:44:08 -06:00