4d87f3bb37
Retrieve commit signatures with Gitaly
2018-01-18 14:10:17 +00:00
8e9c073a14
Merge branch 'feature/merge-request-system-hook' into 'master'
...
System hooks for Merge Requests
See merge request gitlab-org/gitlab-ce!14387
2018-01-18 11:37:16 +00:00
337ced28bc
reference triggers.values for permitted parameters
2018-01-17 09:55:00 +01:00
536a47b4b7
Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
...
[10.3] Migrate `can_push` column from `keys` to `deploy_keys_project`
See merge request gitlab/gitlabhq!2276
(cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c)
1f2bd3c0 Backport to 10.3
2018-01-16 17:04:51 -08:00
8f4b061375
Merge branch 'milestones-finder-order-fix' into 'security-10-3'
...
Remove order param from the MilestoneFinder
See merge request gitlab/gitlabhq!2259
(cherry picked from commit 14408042e78f2ebc2644f956621b461dbfa3d36d)
155881e7 Remove order param from the MilestoneFinder
2018-01-16 17:04:38 -08:00
be353219d1
Merge branch 'issue_41460' into 'master'
...
Fix error on changes tab when merge request cannot be created
Closes #41460
See merge request gitlab-org/gitlab-ce!16409
2018-01-16 12:07:35 +00:00
ca4a59e3df
Fix error on changes tab when merge request cannot be created
2018-01-15 11:53:40 -02:00
a7d26f00c3
Display related merge requests in commit detail page
2018-01-12 20:38:36 +00:00
140935fbfd
Merge branch 'disable-pages-on-jobs' into 'master'
...
Use simple Next/Prev paging for CI Jobs page
Closes #41058
See merge request gitlab-org/gitlab-ce!16392
2018-01-12 14:03:04 +00:00
b64b7d7003
Use simple Next/Prev paging for jobs to avoid large count queries on arbitrarily large sets of historical jobs
2018-01-11 17:45:42 +00:00
729f05f0e3
Adds Rubocop rule for line break around conditionals
2018-01-11 16:34:01 +00:00
e6012d3ecc
Change failed GCP billing check wording
2018-01-11 07:17:06 +01:00
0b294fc2bb
Use new tab for link in flash
2018-01-11 06:10:14 +01:00
0cdd56e658
Fix link to billing
2018-01-10 15:44:15 +01:00
cf6258af41
Fix billing checking
2018-01-10 15:23:22 +01:00
b44583e9c6
Extract GCP billing check as method
2018-01-10 14:35:52 +01:00
66ebb206b0
disables the shortcut to the issue boards when issues are disabled
2018-01-08 09:06:25 +00:00
e7a8564f39
Refactor GCP session token exchange scheme
2018-01-07 16:18:53 +01:00
1fd8d300a3
Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
2018-01-06 19:58:27 +01:00
d13be3c2d9
Store OAuth token in Redis for worker to pick up
2018-01-06 19:41:49 +01:00
b058af1be6
Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
2018-01-05 20:04:33 +01:00
d66c48b303
Merge branch 'master' into 41249-clearing-the-cache
2018-01-05 18:21:45 +01:00
27a75ea175
Backport 'Rebase' feature from EE to CE
...
When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.
This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)
Closes #40301
2018-01-05 09:34:59 +01:00
178537579f
Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
2018-01-05 00:12:04 +01:00
b4e9e07cdd
Remove polling interval from GcpController
2018-01-05 00:09:33 +01:00
9c9f7dc639
Merge branch 'master' into 41249-clearing-the-cache
2018-01-04 23:38:13 +01:00
7d7d289b15
Add missing empty line in #reset_cache
2018-01-04 22:17:03 +01:00
f834e2907d
Move cache reset to ci_cd_settings controller
2018-01-04 22:17:01 +01:00
7f8c8dad86
Merge branch '20035-pause-resume-runners' into 'master'
...
Add pause/resume button to project runners
Closes #20035
See merge request gitlab-org/gitlab-ce!16032
2017-12-29 10:29:20 +00:00
ac1b353e43
Refactor success status in branch controller
2017-12-27 18:58:46 +01:00
f88d5974bb
Add pause/resume button to specific project runners
2017-12-27 09:23:09 -06:00
896b9a6828
Fix when branch creation fails don't post system note
...
Closes #24347
2017-12-26 19:29:54 +01:00
e395a2c190
Implement GCP billing check in cluster form
2017-12-21 19:25:28 +01:00
59c7f46e2a
Remove actions for async GCP project billing check
2017-12-21 19:02:06 +01:00
305bce8d24
Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
2017-12-21 18:30:34 +01:00
6552c36495
Remove a redundant `InvalidPathError` definition
...
This is already defined in `ExtractsPath`, which this controller
includes.
2017-12-20 16:02:36 -06:00
ac22576d80
Merge branch 'zj-gitaly-pipelines-n-1' into 'master'
...
Improve performance of Pipelines#index.json
See merge request gitlab-org/gitlab-ce!14846
2017-12-19 16:23:00 +00:00
c6edae3887
Load commit in batches for pipelines#index
...
Uses `list_commits_by_oid` on the CommitService, to request the needed
commits for pipelines. These commits are needed to display the user that
created the commit and the commit title.
This includes fixes for tests failing that depended on the commit
being `nil`. However, now these are batch loaded, this doesn't happen
anymore and the commits are an instance of BatchLoader.
2017-12-19 10:05:40 +01:00
888ed30969
Merge branch 'fix-cluster-enviroment-missing' into 'master'
...
Fix cluster enviroment missing
See merge request gitlab-org/gitlab-ce!15973
2017-12-19 08:17:54 +00:00
924e00496c
Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'
...
Add button to run scheduled pipeline immediately
Closes #38741
See merge request gitlab-org/gitlab-ce!15700
2017-12-18 13:08:51 +00:00
3870a1bde2
Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'
...
Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests
See merge request gitlab-org/gitlab-ce!15847
2017-12-18 11:28:02 +00:00
9616e70a08
Allow environment_scope in cluster controllers
2017-12-16 17:28:59 +01:00
886fd13fce
Add Worker rerun action to GcpController
2017-12-16 17:02:26 +01:00
6c0fd3c22d
Handle html format in addition to json
2017-12-16 05:31:53 +01:00
914260930f
Expand controller test suite matrix
2017-12-16 05:26:07 +01:00
935a27cfef
Use 1 minute for status polling interval
2017-12-16 04:22:16 +01:00
78f85f3fd3
Add check step for creating GCP clusters
2017-12-16 04:11:44 +01:00
cba40a1f55
Stop sending milestone and labels data over the wire for MR widget
...
requests
2017-12-15 15:31:16 -02:00
627a96875e
Merge branch 'rc/use-factory_bot_rails' into 'master'
...
Replace factory_girl_rails with factory_bot_rails
See merge request gitlab-org/gitlab-ce!15919
2017-12-15 16:32:34 +00:00
ea1d025e36
Merge branch '41136-job-erased' into 'master'
...
Change text from build to job in flash notice
Closes #41136
See merge request gitlab-org/gitlab-ce!15948
2017-12-15 11:57:22 +00:00
Jacob Vosmaer (GitLab)
Douwe Maan
Alexis Reigel
Robert Speicher
Sean McGivern
Felipe Artur
Hiroyuki Sato
Yorick Peterse
Greg Stark
🙈 jacopo beschi 🙉
Matija Čupić
Kamil Trzciński
Christiaan Van den Poel
Jan Provaznik
Grzegorz Bizon
Mateusz Bajorski
Mario de la Ossa
Robert Speicher
Zeger-Jan van de Weg
Oswaldo Ferreira
Filipa Lacerda