aaa51fe9ea
Bump gitlab-reliable-fetcher gem
2018-12-17 20:48:46 +02:00
4a10c813e7
Merge branch 'jlenny-CI_COMMIT_SHORT_SHA' into 'master'
...
Add new predefined variable CI_COMMIT_SHORT_SHA
Closes #48061
See merge request gitlab-org/gitlab-ce!23822
2018-12-17 17:06:53 +00:00
5040ac68d8
Add new predefined variable CI_COMMIT_SHORT_SHA
2018-12-17 17:06:53 +00:00
d82b6d120e
Merge branch 'gt-add-externalized-strings-for-cluster-error-msg' into 'master'
...
Add externalized strings for clusters error messages
Closes #45310
See merge request gitlab-org/gitlab-ce!23753
2018-12-17 16:04:32 +00:00
574ae4c7aa
Merge branch 'fl-update-svg' into 'master'
...
Updates gitlab-svg dependency
See merge request gitlab-org/gitlab-ce!23871
2018-12-17 14:51:29 +00:00
73d4b1f625
Merge branch 'revert-1cccfca1' into 'master'
...
Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'"
See merge request gitlab-org/gitlab-ce!23826
2018-12-17 14:40:29 +00:00
75262862c4
Merge branch 'docs-improve-process' into 'master'
...
Improve & clean up the PROCESS.md doc
See merge request gitlab-org/gitlab-ce!23769
2018-12-17 13:59:52 +00:00
4fc73988a0
Add externalized strings for clusters error messages
2018-12-17 15:45:02 +02:00
0ab50681da
Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'
...
Remove the project_cleanup feature flag
Closes #55230
See merge request gitlab-org/gitlab-ce!23814
2018-12-17 13:25:09 +00:00
e63df6343e
Updates gitlab-svg dependency
2018-12-17 13:10:02 +00:00
e17d303e21
Merge branch 'updateDangerfileCommits' into 'master'
...
Clarify messaging on what fails for too many failed lines
See merge request gitlab-org/gitlab-ce!23862
2018-12-17 13:05:54 +00:00
2f4fe2b503
Merge branch 'inline-duplicated-discussions' into 'master'
...
Fixed duplicated inline diff discussions
Closes #55388
See merge request gitlab-org/gitlab-ce!23843
2018-12-17 12:51:50 +00:00
19fec9a800
Merge branch 'update-page-filter-path-defaults' into 'master'
...
Change `page_filter_path` to not exclude `label_name` by default
See merge request gitlab-org/gitlab-ce!23825
2018-12-17 12:50:55 +00:00
c59ff995a4
Merge branch 'deprecated-comparing-actioncontroller-params-hash' into 'master'
...
Fix deprecation: Comparing equality between ActionController::Parameters and a Hash is deprecated
See merge request gitlab-org/gitlab-ce!23855
2018-12-17 12:34:55 +00:00
368198d8cc
Merge branch 'deprecated-actiondispatch-paramsparser' into 'master'
...
Remove deprecated ActionDispatch::ParamsParser
See merge request gitlab-org/gitlab-ce!23848
2018-12-17 12:33:52 +00:00
e8374cb6f4
Merge branch '55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00acef434031b5dc0bf39576a9e83802c7806842-revert' into 'master'
...
Resolve "Un-revert 00acef4340Closes #55433
See merge request gitlab-org/gitlab-ce!23861
2018-12-17 12:29:20 +00:00
06ceb5970e
Merge branch 'add-horizontal-whitespace-to-profile-page' into 'master'
...
Resolve "User profile page: Enhance horizonal whitespace between Overview columns"
Closes #55252
See merge request gitlab-org/gitlab-ce!23803
2018-12-17 11:42:28 +00:00
6269f35b45
Improve & clean up the PROCESS.md doc
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-17 12:03:48 +01:00
32b6129d8c
Merge branch 'remove-rails4-specific-code' into 'master'
...
Remove rails4 specific code
See merge request gitlab-org/gitlab-ce!23847
2018-12-17 11:02:17 +00:00
9072516f8a
Merge branch 'jramsay/web-terminal' into 'master'
...
Clearly state web terminal is not supported at all on GitLab.com
See merge request gitlab-org/gitlab-ce!23821
2018-12-17 11:01:07 +00:00
a1d9a0e34c
Merge branch '34758-list-ancestor-clusters' into 'master'
...
Show clusters of ancestors in cluster list page
Closes #34758
See merge request gitlab-org/gitlab-ce!22996
2018-12-17 10:25:19 +00:00
dac38419fe
Merge branch '55276-encoding-issue-with-the-user-centric-tooltips' into 'master'
...
Resolve "Encoding issue with the user centric tooltips"
Closes #55276
See merge request gitlab-org/gitlab-ce!23794
2018-12-17 10:24:14 +00:00
5afbeaad3b
Merge branch 'deprecated-positional-seperator-parameter' into 'master'
...
Passing the separator argument as a positional parameter is deprecated
See merge request gitlab-org/gitlab-ce!23334
2018-12-17 10:20:54 +00:00
bf137f43b5
Merge branch 'rubocop-prepend' into 'master'
...
Added Cop for injecting EE modules
See merge request gitlab-org/gitlab-ce!23802
2018-12-17 10:05:40 +00:00
35c69ea218
Merge branch 'rs-prepare-build-parity' into 'master'
...
CE-EE parity for prepare_build script
See merge request gitlab-org/gitlab-ce!23819
2018-12-17 10:02:15 +00:00
c40d979605
Merge branch 'docs-registry_s3_chunksize' into 'master'
...
Add Registry S3 chunksize troubleshooting section
See merge request gitlab-org/gitlab-ce!23841
2018-12-17 09:58:43 +00:00
d8c4252273
Merge branch 'fix-rspec-offcense' into 'master'
...
Fix RSpec/HookArgument rubocop offense
See merge request gitlab-org/gitlab-ce!23776
2018-12-17 09:47:48 +00:00
0f069485c6
Clarify messaging on what fails for too many failed lines
2018-12-17 06:42:59 +00:00
8ce86bf9a0
Revert "Revert "LfsToken uses JSONWebToken::HMACToken by default""
...
This reverts commit 00acef4340
2018-12-17 17:17:39 +11:00
c75c38f8ca
Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'"
...
This reverts merge request
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22929
2018-12-17 14:00:22 +13:00
f82c9dbe44
Use finder to decide to show note to user
...
Given the note is about how to interpret ancestor clusters, use the
finder which actually knows if there are any ancestor clusters to find
out if the note should be shown, rather than passing the same info via a
view to a helper
Added note about Kaminari.paginate_array
Link to followup issue too
2018-12-17 09:51:53 +13:00
2ad5f999e9
Check can :read_clusters in finder
...
This is in addtion to the can checks we have in the controller, as a
finder can be used elsewhere in the future.
2018-12-17 09:51:53 +13:00
0e78834bc9
Move code to presenter
...
Part of the code such as #show_path is already present on the presenter.
Also avoid having code in two places (helper and presenter)
Sanitize and assert html_safe. Additional layer of defense - on top of
GitLab already requiring group names to be composed of small set of
chars A-Z, - and spaces.
Only link to cluster if user can read cluster
Make clear that arg is a GroupClusterablePresenter
Add more specs for completeness
2018-12-17 09:51:53 +13:00
0369e75904
Refactor methods on ClusterHelper
...
- Use sprite_icon instead of hardcoded html
- Use a more descriptive method name
- Changes specs to use html_safe matcher
2018-12-17 09:50:53 +13:00
aa86223a4a
Cleans cluster views a bit
...
- Moves logic into ClustersHelp
- Add CSS to ensure compatibility with EE view.
2018-12-17 09:50:53 +13:00
9dc67bf10c
Move group path display logic to helper
...
Add specs
2018-12-17 09:50:53 +13:00
887bbd8e7e
Update link to documentation
...
Make link clear in note box
Also update strings to be translatable
2018-12-17 09:50:53 +13:00
671c5b2e6f
Render group namespaces in clusters index
2018-12-17 09:50:53 +13:00
bfec22a0fa
Correctly enable "Add Kubernetes cluster" button
2018-12-17 09:50:53 +13:00
7e4f76ea89
Show clusters of ancestors in cluster list page
...
Show both the cluster(s) of the clusterable, and the cluster(s) of
ancestor groups.
2018-12-17 09:50:52 +13:00
de399c4a49
Fix deprecation: Comparing equality between ActionController::Parameters and a Hash is deprecated
2018-12-16 13:45:19 +01:00
56296f1eda
Remove rails4 specific code
2018-12-16 10:48:41 +01:00
807139b6b9
Remove deprecated ActionDispatch::ParamsParser
2018-12-16 10:47:24 +01:00
8b4602041c
Merge branch '55402-broken-master-karma-test-failing-in-spec-javascripts-boards-components-issue_due_date_spec-js' into 'master'
...
Resolve "Broken master: karma test failing in spec/javascripts/boards/components/issue_due_date_spec.js"
Closes #55402
See merge request gitlab-org/gitlab-ce!23845
2018-12-16 01:11:16 +00:00
e8a675d35f
Remove the project_cleanup feature flag
2018-12-15 13:50:59 +00:00
0b74b86367
Fix repository cleanup with object storage on
...
When the BFG object map file is in object storage (i.e., uploads in
general are placed into object storage), we get an instance of the
Gitlab::HttpIO class. This doesn't behave as expected when you try to
read past EOF, so we need to explicitly check for this condition to
avoid ending up in a tight loop around io.read
2018-12-15 13:50:59 +00:00
8d2e1b724b
Merge branch '54786-mr-empty-file-display' into 'master'
...
Display empty files properly on MR diffs
Closes #54786
See merge request gitlab-org/gitlab-ce!23671
2018-12-15 12:21:54 +00:00
60295c1430
Fix broken karma test
2018-12-15 10:50:46 +01:00
c027101d34
Merge branch 'rs-transient-help-page-failure' into 'master'
...
Resolve transient failure in Help page spec
Closes #55372
See merge request gitlab-org/gitlab-ce!23839
2018-12-15 05:50:36 +00:00
9d57e8af69
Merge branch '47052-merge-button-does-not-appear-after-rebase-ing' into 'master'
...
Resolve "Merge button does not appear after Rebase-ing"
Closes #47052
See merge request gitlab-org/gitlab-ce!23572
2018-12-14 22:40:31 +00:00
Valery Sizov
Grzegorz Bizon
Jason Lenny
Douglas Barbosa Alexandre
Phil Hughes
Achilleas Pipinellis
George Tsiolis
Douwe Maan
Filipa Lacerda
Rémy Coutable
Fatih Acet
Yorick Peterse
Kushal Pandya
Dmitriy Zaporozhets
Tim Zallmann
Sam Bigelow
Ash McKenzie
Thong Kuah
Mayra Cabrera
Mike Greiling
Jasper Maes
Stan Hu
Nick Thomas
Martin Wortschack