1e98a10af3
Merge branch 'revert-8678cf9b' into 'master'
...
Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"
See merge request gitlab-org/gitlab-ce!20402
2018-07-05 17:23:00 +00:00
7e1b491caf
Increase capybara JS request timeout
2018-07-05 16:49:18 +00:00
7eddfef439
Merge branch 'dm-invalid-active-service-template' into 'master'
...
Deactivate new KubernetesService created from active template to prevent project creation from failing
Closes gitlab-ee#6753
See merge request gitlab-org/gitlab-ce!20400
2018-07-05 15:58:09 +00:00
8488a39cbc
Merge branch 'port-c32af9da-to-ce' into 'master'
...
Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb
See merge request gitlab-org/gitlab-ce!20407
2018-07-05 15:01:25 +00:00
a7a1531fe5
Web Terminal Ci Build
2018-07-05 13:55:10 +00:00
49828db524
Improves performance on MR refactor and adds specs
2018-07-05 12:05:57 +00:00
6d291cc3a6
File Icons in Merge Requests
2018-07-05 12:02:56 +00:00
45deb92544
Resolve "When editing a comment in an issue, the preview mode is toggled in the main textarea"
2018-07-05 11:59:57 +00:00
b7b3a059f9
Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-07-05 13:28:46 +02:00
64dfe2cba1
Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"
...
This reverts merge request !20339
2018-07-05 10:22:04 +00:00
fe695ebd24
Merge branch 'issue_48474' into 'master'
...
Fix discussion entity for legacy diff notes
Closes #48474
See merge request gitlab-org/gitlab-ce!20214
2018-07-05 10:18:53 +00:00
7e34a19f29
Check whether new service created from template is valid after unflagging it as a template
2018-07-05 11:43:48 +02:00
d04ae01a6a
Merge branch 'remove-unnecessary-ignore-for-gitaly-n-plus-one' into 'master'
...
Remove unnecessary ignore for Gitaly N+1
Closes #47594
See merge request gitlab-org/gitlab-ce!20393
2018-07-05 09:14:27 +00:00
6af7397f60
Close revoke deploy token modal on escape keypress
2018-07-05 07:43:16 +00:00
a43b7d4a33
Merge branch '45738-add-environment-drop-down-to-metrics-dashboard' into 'master'
...
Add `environment` drop down to Metrics dashboard
Closes #45738
See merge request gitlab-org/gitlab-ce!19833
2018-07-05 07:42:00 +00:00
3db2f32759
Enable Capybara/FeatureMethods cop
2018-07-05 06:32:05 +00:00
ce3177df9f
fix failing spec test in gcp_spec
2018-07-04 22:28:32 +00:00
116955c453
Merge branch '45739-add-metrics-to-operations-tab' into 'master'
...
Resolve "Add Metrics to Operations Tab"
Closes #45739
See merge request gitlab-org/gitlab-ce!20025
2018-07-04 17:10:37 +00:00
c0e50fdfc2
Merge branch '19468-add_readme_when_creating_project' into 'master'
...
Add option to add README when creating a project
Closes #19468
See merge request gitlab-org/gitlab-ce!20335
2018-07-04 16:13:23 +00:00
786edcb4f9
populate environments dropdown, add tests
2018-07-04 10:37:19 -05:00
9561db7b8c
Add option to add README when creating a project
2018-07-04 17:35:23 +02:00
6d41df5071
Render LegacyDiffNote when diff_file blob is nil
2018-07-04 12:34:41 -03:00
fa349c08ce
Merge branch '4266-board-with-config-api-ce' into 'master'
...
Backport of EE changes: Allow Labels::FindOrCreateService to find ancestor group labels
Closes #4266
See merge request gitlab-org/gitlab-ce!20364
2018-07-04 15:20:48 +00:00
37a6be36e2
Remove Gitaly N+1 ignore from NotificationRecipientService spec
...
This was because we were creating projects unnecessarily. These should be set as
the `source` for the notification setting, not the `project`!
2018-07-04 16:12:37 +01:00
170a15514a
Merge branch '43446-new-cluster-page-tabs' into 'master'
...
Resolve "Change new cluster page design to use tabs"
Closes #43446 and #46304
See merge request gitlab-org/gitlab-ce!18963
2018-07-04 14:51:38 +00:00
0482e706df
Merge branch 'revert-1ee3ac8c' into 'master'
...
Revert "Merge branch '44726-cancel_lease_upon_completion_in_project_cache_worker' into 'master'"
See merge request gitlab-org/gitlab-ce!20366
2018-07-04 13:45:25 +00:00
4d9a3f42f1
Merge branch 'ee-5481-epic-todos' into 'master'
...
Port of Todos for epics
See merge request gitlab-org/gitlab-ce!19908
2018-07-04 12:57:37 +00:00
4f795ed823
Backport from EE !5954
...
Allow Labels::FindOrCreateService to find ancestor group labels
Add authentication check on API endpoint
Update flayignore
2018-07-04 20:48:50 +08:00
14d2b52b00
Revert "Merge branch '44726-cancel_lease_upon_completion_in_project_cache_worker' into 'master'"
...
This reverts merge request !20103
2018-07-04 11:04:58 +00:00
7a355f6856
Merge branch 'gitaly-mandatory-20180703-jv-2' into 'master'
...
Remove more Gitaly feature flags
Closes gitaly#329, gitaly#320, gitaly#323, and gitaly#328
See merge request gitlab-org/gitlab-ce!20343
2018-07-04 10:39:59 +00:00
48bbb36347
Merge branch 'remove-is-shared-from-ci-runners' into 'master'
...
Remove the use of `is_shared` of `Ci::Runner`
See merge request gitlab-org/gitlab-ce!20172
2018-07-04 10:39:28 +00:00
d026441b3c
Merge branch 'ccr/flaky_mr_list_spec' into 'master'
...
Fix flaky spec for merge request lists
See merge request gitlab-org/gitlab-ce!20316
2018-07-04 10:36:06 +00:00
b2f2241c0c
Merge branch 'jprovazn-fix-mr-caching' into 'master'
...
Use serialize_keys as part of highlight diff cache key
Closes #48801
See merge request gitlab-org/gitlab-ce!20360
2018-07-04 10:25:53 +00:00
0d11c4a8c7
Move group_dropdown_label to ce helper
2018-07-04 11:58:06 +02:00
34694c3afc
Merge branch 'jprovazn-direct-upload' into 'master'
...
Add workhorse authorize method for project/group uploads
Closes #44663
See merge request gitlab-org/gitlab-ce!19717
2018-07-04 09:50:29 +00:00
cda22d0780
Merge branch 'ide-even-more-improved-errors' into 'master'
...
Improve error message across IDE store modules
Closes #47323
See merge request gitlab-org/gitlab-ce!20272
2018-07-04 09:43:56 +00:00
dc551581d0
Use serialize_keys as part of highlight diff cache
...
This assures that old cache is not used if we change format of
cached data.
2018-07-04 11:34:35 +02:00
03f0f2566b
Merge branch 'bvl-graphql-pipeline-lists' into 'master'
...
Add pipeline lists to graphql
Closes #48469
See merge request gitlab-org/gitlab-ce!20249
2018-07-04 09:31:07 +00:00
391710f29d
Merge branch '47040-inconsistent-job-list-in-job-details-view' into 'master'
...
Resolve "Inconsistent job list in job details view"
Closes #47040
See merge request gitlab-org/gitlab-ce!20243
2018-07-04 09:17:42 +00:00
d3bcb06dc6
Make deprecated scopes of Runner explicit
2018-07-04 11:02:45 +02:00
04b046587f
Add pipeline lists to GraphQL
...
This adds Keyset pagination to GraphQL lists. PoC for that is
pipelines on merge requests and projects.
When paginating a list, the base-64 encoded id of the ordering
field (in most cases the primary key) can be passed in the `before` or
`after` GraphQL argument.
2018-07-04 10:53:39 +02:00
99dea5fa13
Makes production environment the default environment for a project
2018-07-04 09:35:25 +01:00
78708b1932
Make more Gitaly features mandatory
2018-07-04 07:39:59 +00:00
18c9cad0ea
Sidebar Todo Component
2018-07-04 13:07:43 +05:30
98eb0578a0
Merge branch 'rs-git-rake-spec-speed' into 'master'
...
Speed up spec/tasks/gitlab/git_rake_spec.rb
See merge request gitlab-org/gitlab-ce!20349
2018-07-04 07:32:10 +00:00
483864db77
Improve performance of toggling diff view type
2018-07-03 23:18:27 +00:00
f5da4815a5
Speed up spec/tasks/gitlab/git_rake_spec.rb
...
Because no Git repository was actually created at the temporary path we
were using, `git fsck` would traverse up until it found a repository,
which in our case was the CE or EE repository.
2018-07-03 17:20:51 -05:00
26998c68c9
Merge branch 'sh-add-captcha-prometheus-counters' into 'master'
...
Add Prometheus metrics to track reCAPTCHA success/failures
See merge request gitlab-org/gitlab-ce!20086
2018-07-03 20:36:11 +00:00
7376ffc3a3
Add Prometheus metrics to track reCAPTCHA success/failures
2018-07-03 11:39:00 -07:00
1181cf336f
Fix minor spec review comments in uploader specs
2018-07-03 09:57:15 -07:00
Grzegorz Bizon
Jacob Vosmaer (GitLab)
Robert Speicher
Sean McGivern
Francisco Javier López
Filipa Lacerda
Tim Zallmann
Constance Okoghenun
Rémy Coutable
Douwe Maan
Douwe Maan
George Tsiolis
Phil Hughes
Winnie Hellmann
Dennis Tang
Jose
Imre Farkas
Felipe Artur
Sean McGivern
Kamil Trzciński (OoO till 3th)
Mark Chao
Jarka Kadlecová
Jan Provaznik
Bob Van Landuyt
Tiago Botelho
Kushal Pandya
Fatih Acet
Robert Speicher
Stan Hu