Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@masterogolowinski-master-patch-80898 | GitLab Bot | 2019-12-16 | 1 | -0/+5 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-10 | 1 | -0/+3 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-26 | 1 | -2/+2 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-07 | 1 | -6/+8 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-04 | 1 | -0/+7 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-01 | 1 | -0/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-30 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-16 | 1 | -0/+6 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-08 | 1 | -2/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-04 | 1 | -1/+23 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-16 | 1 | -0/+4 |
| | |||||
* | Backport of ee/15773: Allow SmartCard authentication to use SAN extensions | Sebastián Arcila Valenzuela | 2019-09-12 | 1 | -0/+4 |
| | |||||
* | Enable JSON logs for Sidekiq by default | Stan Hu | 2019-09-09 | 1 | -1/+1 |
| | | | | | JSON logs include arguments by default, and they're easier to parse/filter. | ||||
* | Add skeleton Pages internal API61927-skeleton-pages-internal-api | Krasimir Angelov | 2019-09-06 | 1 | -0/+3 |
| | | | | | | | Basic `/internal/pages` endpoint that will be used for Pages virtual domains internal API. The endpoint is currently behind feature flag and provides authetication similar to how Workhorse is authenticating with the GitLab. | ||||
* | Add note to gitlab.yml about Service Desk requirement | Winnie Hellmann | 2019-09-04 | 1 | -0/+1 |
| | |||||
* | Add Notification secret into gitlab.yml.template | Valery Sizov | 2019-09-03 | 1 | -0/+1 |
| | |||||
* | Update docs and comments about saml with allow_bypass_two_factor | dodocat | 2019-08-27 | 1 | -0/+8 |
| | | | | allow_bypass_two_factor configration dose not work with saml provider | ||||
* | Enable CSP in gitlab.yml.exampleenable-csp-in-dev-and-ci-ce | Heinrich Lee Yu | 2019-08-22 | 1 | -5/+26 |
| | | | | This enables CSP in dev and CI | ||||
* | Fix typo in Content Security Policy example | J0WI | 2019-08-22 | 1 | -1/+1 |
| | |||||
* | feat: SMIME signed notification emails | Diego Louzán | 2019-08-20 | 1 | -0/+9 |
| | | | | | | - Add mail interceptor the signs outgoing email with SMIME - Add lib and helpers to work with SMIME data - New configuration params for setting up SMIME key and cert files | ||||
* | Add support for Content-Security-Policy | Stan Hu | 2019-08-07 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | A nonce-based Content-Security-Policy thwarts XSS attacks by allowing inline JavaScript to execute if the script nonce matches the header value. Rails 5.2 supports nonce-based Content-Security-Policy headers, so provide configuration to enable this and make it work. To support this, we need to change all `:javascript` HAML filters to the following form: ``` = javascript_tag nonce: true do :plain ... ``` We use `%script` throughout our HAML to store JSON and other text, but since this doesn't execute, browsers don't appear to block this content from being used and require the nonce value to be present. | ||||
* | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809ce-docker_image_replication | Valery Sizov | 2019-08-01 | 1 | -0/+5 |
| | | | | Introducing Docker Registry replication | ||||
* | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597ce-docker_image_replication-event-generation | Valery Sizov | 2019-07-24 | 1 | -0/+9 |
| | | | | | This is the first part of Docker Registry replication for secondary Geo node. | ||||
* | Don't use transactions and exceptions | Reuben Pereira | 2019-07-16 | 1 | -0/+13 |
| | | | | Instead return error objects. | ||||
* | CE-EE parity for shared config files | Robert Speicher | 2019-07-09 | 1 | -0/+3 |
| | | | | | This copies over EE-specific changes to shared configuration files in CE. | ||||
* | Replace 'JIRA' with 'Jira' | Takuya Noguchi | 2019-06-28 | 1 | -1/+1 |
| | | | | | | https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> | ||||
* | Backport gitlab.yml.example from EEconfig-yaml-differences | Yorick Peterse | 2019-06-20 | 1 | -1/+197 |
| | | | | | | | | To make this happen, we need to conditionally add the group_saml strategy when running tests, but only on EE. This requires some changes to Gitlab.ee? so that it can be used before/without loading the Rails environment. We also have to change how we require a few files, so this can run outside of Rails. | ||||
* | Add Puma sampler | Jan Provaznik | 2019-05-29 | 1 | -0/+2 |
| | | | | | This sampler gathers Puma-specific metrics which can be used by Prometheus then. | ||||
* | Expain usage of `artifacts_server` in `gitlab.yml`explain-artifacts-server-configuration-docs | Krasimir Angelov | 2019-05-10 | 1 | -1/+1 |
| | | | | | | Add comment to clarify intended usage of `artifacts_server`. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/49475. | ||||
* | Remove from providers with icon | Gosia Ksionek | 2019-05-07 | 1 | -0/+4 |
| | | | | | | Remove puts Remove puts | ||||
* | Allow Sentry client-side DSN to be passed on gitlab.yml | Douglas Barbosa Alexandre | 2019-05-01 | 1 | -0/+1 |
| | |||||
* | feat: allow Sentry configuration to be passed on gitlab.yml | Roger Meier | 2019-04-30 | 1 | -0/+7 |
| | |||||
* | Add doc link to omnibus for changing gitlab.yml | Dmitriy Zaporozhets | 2019-04-10 | 1 | -1/+2 |
| | |||||
* | Allow external diffs to be used conditionally | Nick Thomas | 2019-03-27 | 1 | -0/+8 |
| | | | | | | | | | | Since external diffs are likely to be a bit slower than in-database ones, add a mode that makes diffs external after they've been obsoleted by events. This should strike a balance between performance and disk space. A background cron drives the majority of migrations, since diffs become outdated through user actions. | ||||
* | Integrate Gitlab::Keys with Gitlab::Shell | Patrick Bajao | 2019-03-19 | 1 | -0/+2 |
| | | | | | | | | | | | In this commit, some methods that aren't being used are removed from `Gitlab::Shell`. They are the ff: - `#remove_keys_not_found_in_db` - `#batch_read_key_ids` - `#list_key_ids` The corresponding methods in `Gitlab::Keys` have been removed as well. | ||||
* | Update packages comment in gitlab.yml.example [ci skip] | Dmitriy Zaporozhets | 2019-03-07 | 1 | -1/+1 |
| | |||||
* | Allow raw `tls_options` to be passed in LDAP configuration | Drew Blessing | 2019-03-04 | 1 | -15/+50 |
| | | | | | | | We've previously exposed ca_file and ssl_version but there are many possible options that can be used inside tls_options. Instead of exposing individual ones, simply expose the entire hash so it can be passed in and we won't have to add things in the future. | ||||
* | Prepare test suite for switch to Gitaly-embedded Git hooks | Jacob Vosmaer | 2019-02-27 | 1 | -2/+0 |
| | |||||
* | Allow MR diffs to be placed into an object store | Nick Thomas | 2019-02-05 | 1 | -0/+29 |
| | |||||
* | Add SSE-C key configuration option for Amazon S3 remote backups | Pepijn Van Eeckhoudt | 2019-01-09 | 1 | -0/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into support-gitaly-tls | Ahmad Hassan | 2018-12-11 | 1 | -8/+11 |
|\ | |||||
| * | Support RSA and ECDSA algorithms in Omniauth JWT | Michael Tsyganov | 2018-12-05 | 1 | -8/+8 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Add config to disable impersonation | Imre Farkas | 2018-11-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | Adds gitlab.impersonation_enabled config option defaulting to true to keep the current default behaviour. Only the act of impersonation is modified, impersonation token management is not affected. | ||||
* | | Merge remote-tracking branch 'origin/master' into support-gitaly-tls | Ahmad Hassan | 2018-11-15 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | Merge branch 'dz-add-packages-to-yml' into 'master' | Marin Jankovski | 2018-11-06 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | Add packages section to CE config file See merge request gitlab-org/gitlab-ce!22151 | ||||
| | * | Add packages section to CE config filedz-add-packages-to-yml | Dmitriy Zaporozhets | 2018-10-05 | 1 | -0/+4 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Fix typos in comments and specs | George Tsiolis | 2018-11-01 | 1 | -1/+1 |
| | | | |||||
* | | | Add documentation for tls gitaly | Ahmad Hassan | 2018-11-02 | 1 | -1/+1 |
|/ / | |||||
* | | Remove broken git storage for testing | Zeger-Jan van de Weg | 2018-10-23 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | Broken storage used to be used to test situations where the Git storage wasn't being reached. These days we can just mock the Gitaly response. But given the broken storage is removed now, Gitaly can take over control of the storage being reachable. If it's not, Gitaly won't boot. That's nice for situations where a disk wasn't mounted for instance. Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675 | ||||
* | | Make GitLab pages support access control | Tuomo Ala-Vannesluoma | 2018-10-05 | 1 | -0/+1 |
|/ |