e00a7faba0
Add support for SSH certificate authentication
...
Why and how to enable this is covered in the docs being changed
here. This requires gitlab-org/gitlab-shell@2e8b670 ("Add support for
SSH certificate authentication", 2018-06-14) which has been merged in
and tagged as 8.0.0, so GITLAB_SHELL_VERSION needs to be bumped.
Merging this closes gitlab-org/gitlab-ce#34572 see
gitlab-org/gitlab-shell!207 for the gitlab-shell MR.
Implementation notes:
- The APIs being changed here are all internal, and their sole
consumer is gitlab-shell.
- Most of the changed code is a MR to gitlab-shell, see the
gitlab-org/gitlab-shell!207 MR. That change covers why only some of
the internal methods get a new "username" parameter, and why some
others only get a "user_id".
2018-08-01 08:44:39 +02:00
ed81ee9ba2
Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'"
...
This reverts merge request !20679
2018-07-27 13:12:35 +00:00
636ea40e18
Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'
...
Resolve "Making instance-wide data tools more accessible"
Closes #41416 and #48507
See merge request gitlab-org/gitlab-ce!20679
2018-07-27 13:03:50 +00:00
a79094b292
Add instance statistics settings to API
2018-07-27 14:14:47 +02:00
3f0e6d9205
More Gitaly cleanup: fetch_ref, allow disk access blocks
2018-07-27 08:43:19 +00:00
13ea4b387d
Merge remote-tracking branch 'dev/master'
2018-07-26 18:30:50 -03:00
33aa3ca8e0
Merge branch 'ce-5158-metrics-alerting' into 'master'
...
Backport 5158-metrics-alerting to CE
See merge request gitlab-org/gitlab-ce!20148
2018-07-26 09:46:55 +00:00
64661425ad
Merge branch 'bvl-graphql-wip-mutation' into 'master'
...
toggle wip status using GraphQL mutation
Closes #48719
See merge request gitlab-org/gitlab-ce!20443
2018-07-26 07:52:39 +00:00
046796cc3a
Resolve "API endpoint that returns all members, including the inherited membership through ancestor group"
2018-07-25 21:45:42 +00:00
3bcb04f100
Add mutation toggling WIP state of merge requests
...
This is mainly the setup of mutations for GraphQL. Including
authorization and basic return type-structure.
2018-07-25 18:37:12 +02:00
fab7dacc26
Updates CE backport
2018-07-25 09:39:39 +01:00
f7abde937d
Move kubeclient and namespace variables to the private interface
2018-07-25 09:39:39 +01:00
eb7c08c7a6
Backports relevant changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5163 to CE
2018-07-25 09:39:39 +01:00
61bed25a88
Merge branch 'sh-use-wiki-limit-parameter-gitaly' into 'master'
...
Use limit parameter to retrieve Wikis from Gitaly
See merge request gitlab-org/gitlab-ce!20764
2018-07-25 07:50:35 +00:00
23f705f2d0
Fix: redirect non-SSL request for gitlab registry to valid URL
...
HTTP host and URI should not be separated by a colon. Generated URLs was looking like http://registry.examples.com:/foo . That is throwing up let's encrypt cert requests for gitlab registry.
2018-07-24 22:42:23 +00:00
c8ff6b7c73
Use limit parameter to retrieve Wikis from Gitaly
...
Without this parameter, every load of a Wiki page will load all the Wiki pages
in the repository for the sidebar. This is a significant performance penalty
that can significant slow the display of all Wiki pages.
Relates to #40101
2018-07-24 15:36:31 -07:00
1771b19464
Merge remote-tracking branch 'origin/master' into dev-master
2018-07-24 14:08:24 -07:00
236ed1f2f3
Merge branch 'security-event-counters-private-data' into 'master'
...
[master] Don't expose project names in various counters
See merge request gitlab/gitlabhq!2418
2018-07-24 20:25:25 +00:00
be495c6a80
Fix slow Markdown rendering
...
The sanitize transformers were being duplicated each time the Markdown
renderer was called, leading to expontential growth in rendering times.
The problem was that although HTML::Pipeline::SanitizationFilter.WHITELIST
is a frozen hash, the `:transformers` array can be modified. We need
to do deep copy of this to avoid adding duplicates.
Closes #49409
2018-07-24 13:00:49 -07:00
c06e2ac888
Merge branch 'backport-gitlab-database' into 'master'
...
Backport various EE changes to Gitlab::Database
See merge request gitlab-org/gitlab-ce!20809
2018-07-24 16:48:27 +00:00
e659b398f3
Merge branch 'zj-backup-timeout' into 'master'
...
Remove timeouts for long running requests
See merge request gitlab-org/gitlab-ce!20810
2018-07-24 13:15:25 +00:00
99011a61cf
Add an option to have a private profile on GitLab
2018-07-24 12:46:19 +00:00
e77f46d129
Remove timeouts for long running requests
2018-07-24 13:56:28 +02:00
ad73953772
Make repository cleanup mandatory
2018-07-24 13:25:27 +02:00
2ade035eb2
Backport various EE changes to Gitlab::Database
...
These changes are useful for CE as well. For example, the MR
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20720 can make
use of some of the backported methods.
2018-07-24 13:25:01 +02:00
4147a2dbbd
Annotate Gitlab::Git::Repository#fetch_ref
2018-07-24 06:33:55 +00:00
34c57e09b9
Merge branch 'api-minimal-access-level' into 'master'
...
Add filter for minimal access level in groups and projects API
Closes #48165
See merge request gitlab-org/gitlab-ce!20478
2018-07-23 19:30:29 +00:00
6d72bb3832
Add min_access_level filter to projects API
...
Signed-off-by: Marko, Peter <peter.marko@siemens.com>
2018-07-23 20:57:50 +02:00
9cdf4292c5
Add min_access_level filter to groups API
...
Signed-off-by: Marko, Peter <peter.marko@siemens.com>
2018-07-23 20:57:50 +02:00
e326e94a27
Merge branch 'sh-enable-frozen-literals-banzi-filters' into 'master'
...
Enable frozen strings in remaining lib/banzai/filter/*.rb files
See merge request gitlab-org/gitlab-ce!20777
2018-07-23 17:32:07 +00:00
771e93747e
Merge branch 'sh-freeze-banzai-filter-strings' into 'master'
...
Enable frozen strings in lib/banzai/filter/*.rb
See merge request gitlab-org/gitlab-ce!20775
2018-07-23 15:56:59 +00:00
954f307673
Enable frozen strings in remaining lib/banzai/filter/*.rb files
...
This also fixes a bug with the ImageLazyLoadFilter not doing the right
thing when an existing class attribute is present.
Part of #47424
2018-07-23 07:34:31 -07:00
cc540bb2a2
Merge branch 'da-feature-flags' into 'master'
...
Allow feature flag names to be a symbol
See merge request gitlab-org/gitlab-ce!20728
2018-07-23 10:11:12 +00:00
8b4154b57f
Enable frozen strings in lib/banzai/filter/*.rb
...
Excludes a few filters that require more work:
* lib/banzai/filter/image_lazy_load_filter_spec.rb
* lib/banzai/filter/syntax_highlight_filter_spec.rb
* lib/banzai/filter/table_of_contents_filter_spec.rb
Part of #47424
2018-07-23 02:39:45 -07:00
d1f890e9e4
Merge branch 'gitaly-add-remote-mandatory' into 'master'
...
Remove unused rugged code that is currently on Gitaly
See merge request gitlab-org/gitlab-ce!20754
2018-07-23 09:20:38 +00:00
82a8903979
Merge branch 'hangouts_chat_integration' into 'master'
...
Hangouts chat integration
See merge request gitlab-org/gitlab-ce!20290
2018-07-23 09:20:16 +00:00
c52ab9141c
Fix gitlab import project load
2018-07-23 07:52:15 +00:00
480b534568
Merge branch 'rs-web_url-for-pipelines-and-jobs' into 'master'
...
Expose web_url attribute in PipelineBasic and JobBasic
See merge request gitlab-org/gitlab-ce!20703
2018-07-23 07:50:27 +00:00
8bc7845fbf
Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'
...
Resolve "Disable SAML and Bitbucket if OmniAuth is disabled"
Closes #48932
See merge request gitlab-org/gitlab-ce!20608
2018-07-23 07:48:00 +00:00
477f9ed78f
Bring JsonLogger to CE
...
This backports a module that was in EE for Geo so that other modules
can have structured logging support.
2018-07-20 12:50:20 -07:00
d4c3a9ab41
Remove unused rugged code that is currently on Gitaly
2018-07-20 14:47:50 -04:00
0f02ce3563
Ensure a job preloads the project's namespace to avoid N+1
2018-07-20 10:00:09 -07:00
6354d55470
Fixing bug with wiki ref in ProjectSearchResults
2018-07-20 13:49:30 +00:00
470e526a20
Merge branch 'fix/gb/fix-deserializing-ci-yaml-variables' into 'master'
...
Fix deserializing YAML variables when a build has been imported
Closes #49406
See merge request gitlab-org/gitlab-ce!20713
2018-07-20 13:01:25 +00:00
3bd8a783e8
Merge branch 'zj-remove-refs-cleanup' into 'master'
...
Remove refs cleanup job
See merge request gitlab-org/gitlab-ce!20716
2018-07-20 11:48:26 +00:00
d0afab482f
Disable SAML if OmniAuth is disabled
...
We also try to unify the way we setup OmniAuth, and how we check
if it's enabled or not.
2018-07-20 18:54:46 +08:00
256e7a6396
Merge branch 'zj-gitaly-migrate-old-migrations' into 'master'
...
Gitaly migrate old DB migrations
Closes gitaly#1106
See merge request gitlab-org/gitlab-ce!20708
2018-07-20 10:21:05 +00:00
06e03f6e4d
Allow feature flag names to be a symbol
2018-07-19 21:05:24 -03:00
fa1ea656f7
Migrate add_remote, remove_remote, fetch_internal_remote to gitaly
2018-07-19 15:07:37 -04:00
c3c7f26a34
Backport of gitlab-org/gitlab-ee!6137
2018-07-19 18:32:12 +00:00
Ævar Arnfjörð Bjarmason
Sean McGivern
Bob Van Landuyt
Jacob Vosmaer (GitLab)
Felipe Artur
Douwe Maan
🙈 jacopo beschi 🙉
Tiago Botelho
jelhan
Stan Hu
Felipe Artur Cardozo
Rémy Coutable
JX Terry
Zeger-Jan van de Weg
Yorick Peterse
Robert Speicher
Marko, Peter
Francisco Javier López
Alejandro Rodríguez
Robert Speicher
Kamil Trzciński
Lin Jen-Shin
Douglas Barbosa Alexandre
Valery Sizov