Rydkin Maxim
a4d08e6bab
rename `auto_canceled_by` and add foreign key
2017-04-04 21:11:24 +03:00
Rydkin Maxim
40f67c1da8
more brief way of get parent commit
2017-04-04 21:11:24 +03:00
Rydkin Maxim
67f27a1c4b
change order of enum options in auto_cancel_pending_pipelines
2017-04-04 21:11:24 +03:00
Rydkin Maxim
9bdb869a0a
fix typo
2017-04-04 21:11:24 +03:00
Rydkin Maxim
b1dc850ad6
move `auto_cancelable_pipelines` method to `create_pipeline_service.rb`
2017-04-04 21:11:24 +03:00
Rydkin Maxim
c77b1cb0fb
add `does not cancel HEAD pipeline` spec
2017-04-04 21:11:24 +03:00
Rydkin Maxim
c81ef3041e
add auto-cancel for pending pipelines on branch, if they are not HEAD
...
fix changelog MR reference
add non-HEAD builds finder and add `created` pipelines to scope
add spec for auto-cancel non-HEAD pipelines and refactor create_pipeline_service_spec
more refactoring for spec
adds option for auto-cancel into CI/CD settings
fix spec to new configuration
fix rubocop
fix schema.rb
fix schema.rb
replace Gitlab 9.0 with 9.1 in doc
change wording on pipeline settings
added auto_canceled_by field as identifier of autocancel subject
remove unnecessary index
replace service with retry_lock
replace auto_cancel_pending_pipelines boolean setting with integer (and enum in model)
fix schema.rb
fix schema.rb
remove projekt attribute and clean up spec
clean up spec withcouple of shared examples
added spec for "It does not cancel current pipeline" scenario
add some specs to auto-cancel
add spec for another branch pipelines
2017-04-04 21:11:24 +03:00
Clement Ho
0a4b853f2c
Merge branch 'refactor_simulate_drag' into 'master'
...
Refactor test_utils bundle
See merge request !10437
2017-04-04 17:47:16 +00:00
Mike Greiling
4461e7087d
Refactor test_utils bundle
2017-04-04 17:47:12 +00:00
Achilleas Pipinellis
d8cbe97916
Merge branch '30451-fix-docs-check-jobs-shallow-fetch' into 'master'
...
Fetch the default number of commits (20) for docs:check jobs
Closes #30451
See merge request !10449
2017-04-04 17:35:28 +00:00
Rémy Coutable
93de37ce1b
Merge branch 'bug/api_milestone_merge_requests_scope' into 'master'
...
Fixes milestone/merge_request API endpoint to really scope the results
See merge request !10369
2017-04-04 16:45:31 +00:00
Rémy Coutable
93e36d56e0
Merge branch 'fix/import-fork' into 'master'
...
Fix issues importing forked projects
Closes #26184 and #29380
See merge request !9102
2017-04-04 16:34:25 +00:00
James Lopez
22d7ae8002
Fix issues importing forked projects
2017-04-04 16:34:19 +00:00
Filipa Lacerda
82836af4e7
Merge branch 'issue-boards-scrollbars' into 'master'
...
Fixed issue boards having a vertical scrollbar
Closes #30209
See merge request !10312
2017-04-04 16:00:17 +00:00
Sean McGivern
6c6eef939a
Merge branch '30400-fix-blob-highlighting-in-search' into 'master'
...
Fix blob highlighting in search
Closes #30400
See merge request !10420
2017-04-04 15:57:17 +00:00
Sean McGivern
20e3ed6093
Merge branch 'workhorse-gitaly-address' into 'master'
...
Pass GitalyAddress to workhorse
See merge request !10447
2017-04-04 15:48:24 +00:00
Rémy Coutable
2d3987e38f
Fetch the default number of commits (20) for docs:check jobs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-04 17:29:21 +02:00
Filipa Lacerda
a46cca2e58
Merge branch 'environment-performance-improvements' into 'master'
...
Improved Environments Metrics UX
Closes #29227
See merge request !9946
2017-04-04 15:19:17 +00:00
Filipa Lacerda
10c7685330
Merge branch 'remove-unused-icons' into 'master'
...
Delete unused icons; add empty lines to svg files
See merge request !10415
2017-04-04 14:53:32 +00:00
Robert Speicher
1d96b01f3f
Merge branch 'fix/disable-gitaly-post-receive-pack' into 'master'
...
Disable support for Gitaly PostReceivePack
See merge request !10444
2017-04-04 14:52:38 +00:00
Robert Speicher
3301f4a22b
Merge branch 'feature/bump-gitaly-server-version' into 'master'
...
Bump Gitaly server version to 0.5.0
See merge request !10446
2017-04-04 14:48:32 +00:00
Rémy Coutable
0961728793
Merge branch 'patch-17' into 'master'
...
list recommended version of PostgreSQL
See merge request !10190
2017-04-04 14:10:49 +00:00
Ben Bodenmiller
7bf1881fd6
list recommended version of PostgreSQL
2017-04-04 14:10:49 +00:00
Douwe Maan
382060b927
Merge branch '24187-set-git-terminal-prompt-env-var-in-initializer' into 'master'
...
Adds git terminal prompt env var to application rb
Closes #24187
See merge request !10372
2017-04-04 13:56:42 +00:00
Jacob Vosmaer
ca94d20013
Pass GitalyAddress to workhorse
2017-04-04 15:41:50 +02:00
Sean McGivern
796d65f1fe
Merge branch '29492-useless-queries' into 'master'
...
remove useless queries with false conditions (e.g 1=0)
Closes #29492
See merge request !10141
2017-04-04 13:33:42 +00:00
Kamil Trzciński
7f8f927aaf
Merge branch 'zj-kube-service-auto-fill' into 'master'
...
Don't autofill kubernetes namespace
See merge request !10438
2017-04-04 13:07:32 +00:00
Sean McGivern
95188e72c2
Merge branch 'backport-es-global-search-difference' into 'master'
...
Backport differences in global search from EE to CE
See merge request !10445
2017-04-04 13:06:28 +00:00
Achilleas Pipinellis
3e663a24fe
Merge branch '29670-jira-integration-documentation-improvment' into 'master'
...
Improves Jira integration documentation
Closes #29670
See merge request !10067
2017-04-04 12:54:48 +00:00
Achilleas Pipinellis
ea35b1193a
Merge branch 'sh-add-polling-images' into 'master'
...
Add long polling diagrams
See merge request !10270
2017-04-04 12:53:16 +00:00
Achilleas Pipinellis
97313fddc4
Merge branch 'master' into 'master'
...
Update patch_versions.md, add `yarn:install` in `Clean up assets and cache` command.
See merge request !10442
2017-04-04 12:49:15 +00:00
Yorick Peterse
c5dae616c2
Merge branch 'remove_index_for_users.current_sign_in_at' into 'master'
...
Remove index for users.current sign in at
Closes #29523
See merge request !10401
2017-04-04 12:05:17 +00:00
Sean McGivern
ae20a1a28d
Merge branch '24784-system-notes-icons' into 'master'
...
Split status and confidentiality action
See merge request !10443
2017-04-04 12:04:49 +00:00
Ahmad Sherif
f5b8dcf140
Bump Gitaly server version to 0.5.0
2017-04-04 14:01:01 +02:00
Nick Thomas
099acf714f
Backport differences in global search from EE to CE
2017-04-04 12:57:16 +01:00
Ahmad Sherif
d56e422257
Disable support for Gitaly PostReceivePack
...
See https://gitlab.com/gitlab-org/gitaly/issues/172
2017-04-04 13:31:33 +02:00
Kamil Trzciński
5efd67942c
Merge branch 'backport-sticking-api-helper-changes' into 'master'
...
Backport API changes needed to fix sticking in EE
See merge request !10376
2017-04-04 11:31:21 +00:00
mhasbini
e52b1df1d5
Remove useless queries with false conditions (e.g 1=0)
2017-04-04 13:54:58 +03:00
Z.J. van de Weg
e6ffb1580b
Don't autofill kubernetes namespace
2017-04-04 12:47:51 +02:00
Jarka Kadlecova
d67d43d1b6
Split status and confidentiality action
2017-04-04 12:36:58 +02:00
xyb
d4f3ce5e96
Update patch_versions.md, add `yarn:install` in `Clean up assets and cache` command.
2017-04-04 10:23:44 +00:00
Sean McGivern
5f7ebfb9aa
Merge branch 'rc/fix-transient-failures-following-no-ffaker' into 'master'
...
Ensure we generate unique usernames otherwise validations fail
See merge request !10436
2017-04-04 09:44:05 +00:00
Robert Speicher
b57ed57f6b
Merge branch 'rc/fix-spinach-plus-knapsack-properly' into 'master'
...
Fix a Knapsack issue that would load support/capybara.rb before support/env.rb
See merge request !10430
2017-04-04 07:53:19 +00:00
Rémy Coutable
d7e3fadb42
Ensure we generate unique usernames otherwise validations fail
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-04 08:48:49 +02:00
Robert Speicher
fa65b65b0f
Merge branch '29643-stop-using-ffaker-in-factories' into 'master'
...
Don't use FFaker in factories, use sequences instead
Closes #29643
See merge request !10184
2017-04-04 01:22:39 +00:00
Robert Speicher
2fd089a22d
Merge branch '29241-fix-transient-failure' into 'master'
...
Ensure users have a short username otherwise a click event is triggered outside the search field
Closes #29241
See merge request !10411
2017-04-04 01:20:04 +00:00
Rémy Coutable
aea21a12ba
Merge branch 'quiet-pipelines' into 'master'
...
Quiet pipeline emails
Closes #24845
See merge request !10333
2017-04-04 00:29:50 +00:00
Rémy Coutable
e97d1ae036
Fix a Knapsack issue that would load support/capybara.rb before support/env.rb
...
Once https://github.com/ArturT/knapsack/issues/57 is solved and released
in a new gem version, we can remove the KNAPSACK_TEST_DIR in
.gitlab-ci.yml.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-04 01:57:41 +02:00
Stan Hu
a3b1ff40fc
Merge branch 'rs-bullet-raise' into 'master'
...
Enable the `bullet_logger` setting; enable `raise` in test environment
Closes #30129
See merge request !10263
2017-04-03 23:01:48 +00:00
Rémy Coutable
5f7e671fdc
Merge branch 'pages-debug-log' into 'master'
...
Log errors in UpdatePagesService
See merge request !10335
2017-04-03 22:45:35 +00:00