root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
101,375 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

16644 Commits

Author SHA1 Message Date
Pavel Shutsin f089a23015 Backport EE changes for productivity analytics 
Improve diff lines count efficiency
 2019-09-04 13:01:55 +03:00
Kamil Trzciński fd561023c4 Merge branch '61927-internal-api-jwt-auth' into 'master' 
Extract Workhorse <-> GitLab JWT authentication to make it reusable

See merge request gitlab-org/gitlab-ce!32623
 2019-09-04 09:42:53 +00:00
Krasimir Angelov 4c63c63192 Extract Workhorse <-> GitLab authentication to make it reusable 
Introduce JWTAutheticatable module that can be reused for ai=uthtication
between Pages and GitLab (the same way we use do now for Workhorse).

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/61927.
 2019-09-04 11:03:20 +12:00
Krasimir Angelov c4b804c6db Rename API::Internal class to API::Internal::Base 
so that we can use API::Internal namespace.

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/61927.
 2019-09-04 10:07:49 +12:00
Stan Hu 7bf4ef5026 Merge branch 'fix-performance-bar-thresholds' into 'master' 
Fix performance bar thresholds

See merge request gitlab-org/gitlab-ce!32587
 2019-09-03 20:48:17 +00:00
Michael Kozono 5256f01183 Merge branch '66464-typo-in-release_endpoint_requiremets-constant' into 'master' 
Resolve "Typo in RELEASE_ENDPOINT_REQUIREMETS constant"

Closes #66464

See merge request gitlab-org/gitlab-ce!32468
 2019-09-03 18:37:09 +00:00
Kamil Trzciński 1cb0fa18df Merge branch '65509-improve-gc-report-buckets-granularity' into 'master' 
Improve GC_REPORT_BUCKETS granularity

See merge request gitlab-org/gitlab-ce!32586
 2019-09-03 13:39:51 +00:00
Winnie Hellmann ebb8197860 Remove outdated mail_room check 2019-09-03 13:37:47 +00:00
Sean McGivern 18018bcd41 Fix performance bar thresholds 
These were written in seconds but are supposed to be in
milliseconds. The total Gitaly time was wrong for the same reason.
 2019-09-03 13:13:36 +01:00
Aleksei Lipniagov b4d62471f1 Improve GC_REPORT_BUCKETS granularity 2019-09-03 15:00:34 +03:00
Etienne Baqué a43ab8d6a4 Added relationships between Release and Milestone 
Modified schema via migrations.
Added one-to-one relationship between the two models.
Added changelog file
 2019-09-03 09:38:59 +00:00
Lin Jen-Shin abd9e84272 Merge branch 'ce-12996-cancel-redundant-pipelines' into 'master' 
Backport retries options for cancel_running

See merge request gitlab-org/gitlab-ce!32525
 2019-09-03 06:31:58 +00:00
Ash McKenzie 594f56e1ef Merge branch 'an-use-labkit-correlation-id' into 'master' 
Remove all references to Gitlab::CorrelationId

See merge request gitlab-org/gitlab-ce!32228
 2019-09-03 04:43:46 +00:00
Giorgenes Gelatti f5b2899422 If user can push to docker then it can delete too 
Extends the permission of $CI_REGISTRY_USER to allow them
to delete tags in addition to just pushing.

https://gitlab.com/gitlab-org/gitlab-ce/issues/40096
 2019-09-03 02:41:22 +00:00
Rémy Coutable b663a872d9
Update Code-Quality.gitlab-ci.yml to use `only.refs` 
This allows overriding `only.refs` to something else if needed.
 2019-09-02 12:19:15 -03:00
Reuben Pereira 414523b0bf Handle :9090 and 0.0.0.0:9090 listen_address formats 
Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090.
But before these can be used to connect a project to Prometheus, they
have to converted into absolute URIs.
 2019-09-02 14:35:02 +00:00
Grzegorz Bizon 60fd42172f Merge branch '66803-fix-uploads-relative-link-filter' into 'master' 
Fix permissions check in `RelativeLinkFilter`

See merge request gitlab-org/gitlab-ce!32448
 2019-09-02 12:05:33 +00:00
mdhtr 6b0d8948ab Remove reference of external example 
as requested by the reviewer
 2019-09-02 11:02:06 +00:00
Sean Carroll 6889196116 Backport EE issue 12996 2019-09-02 12:59:30 +02:00
Massimeddu Cireddu aef0d81792 Fixing #65389 
Wrong format on MS Teams integration push events with multi line commit messages
 2019-09-02 10:43:54 +00:00
Rémy Coutable b7398bc1fd Merge branch 'fix-peek-on-puma' into 'master' 
Fix Peek on Puma

Closes #66528

See merge request gitlab-org/gitlab-ce!32213
 2019-09-02 08:43:21 +00:00
Sean Carroll fc9f3894e8 Correct typo in constant 2019-09-02 09:03:07 +02:00
charlieablett c3c84ff8ea Tidy up conditional message 2019-09-02 17:52:11 +12:00
charlieablett 23bb9424c0 Handle projectless `help` commands to chatops 
- Pass in a nil project to Gitlab::SlashCommands::ApplicationHelp.new
if the chatops command is help.
- Modify the Gitlab::SlashCommands::Presenters::Help message to skip
printing out project information.
 2019-09-02 17:35:45 +12:00
Heinrich Lee Yu be0f039d9c Fix upload URLs in Markdown 
Fixes RelativeLinkFilter for users that don't have access
to the project's repository
 2019-09-02 13:03:14 +08:00
Ash McKenzie 6e744f7071 Merge branch 'sh-fix-ci-lint-500-error' into 'master' 
Fix 500 error in CI lint when included templates are an array

Closes #66605

See merge request gitlab-org/gitlab-ce!32232
 2019-09-02 01:00:29 +00:00
Thong Kuah 6d033c669b Merge branch '46686-move-k8s-services-out-of-gcp-namespace' into 'master' 
Move generic k8s services out of GCP namespace

See merge request gitlab-org/gitlab-ce!32310
 2019-09-01 22:26:00 +00:00
Nick Thomas a8a10a0038 Merge branch 'improve-chatops-help' into 'master' 
Improve chatops help output

See merge request gitlab-org/gitlab-ce!32208
 2019-09-01 12:42:22 +00:00
Stan Hu bf50573710 Fix 500 error in CI lint when included templates are an array 
Previously the following syntax would fail in the linter with an
error 500:

```
include:
  template:
    - License-Management.gitlab-ci.yml
    - Dependency-Scanning.gitlab-ci.yml
    - SAST.gitlab-ci.yml
```

Now the error will call out specifically that the value
is not a string.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66605
 2019-08-31 04:38:12 -07:00
Jesse Hall 05a37f69e1 Fix for #56295, https://gitlab.com/gitlab-org/gitlab-ce/issues/56295. 
All avatars now visible in commit trailers.
 2019-08-30 17:26:10 +00:00
Andrew Newdigate 18e5362e87 Fix for histogram corruption in Sidekiq 
This fixes a bug in which sidekiq histograms contain invalid labels.

See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7729
for more details.
 2019-08-30 14:04:45 +00:00
Juliette de Rancourt 8501e13bbc Resolve "Use "moved" instead of "closed" in issue references" 2019-08-30 06:16:01 +00:00
Robert Speicher 7698d40550
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2019-08-29 17:17:37 -05:00
GitLab Release Tools Bot 090956259c Merge branch 'security-enable-image-proxy' into 'master' 
Use image proxy to mitigate stealing ip addresses

Closes #2812

See merge request gitlab/gitlabhq!2926
 2019-08-29 21:34:29 +00:00
GitLab Release Tools Bot 5a008d1368 Merge branch 'security-epic-notes-api-reveals-historical-info-ce-master' into 'master' 
Filter out old system notes for epics in notes api endpoint response

See merge request gitlab/gitlabhq!3224
 2019-08-29 21:34:24 +00:00
GitLab Release Tools Bot 34c2b6adf9 Merge branch 'security-personal-snippets' into 'master' 
Add direct upload support for personal snippets

See merge request gitlab/gitlabhq!3226
 2019-08-29 21:34:22 +00:00
GitLab Release Tools Bot 7d6ec7f7ed Merge branch 'security-fix_jira_ssrf_vulnerability' into 'master' 
Fix DNS rebind vulnerability for JIRA integration

See merge request gitlab/gitlabhq!3266
 2019-08-29 21:34:17 +00:00
GitLab Release Tools Bot b01c7ad291 Merge branch 'security-61974-limit-issue-comment-size' into 'master' 
Limit the size of issuable description and comments

See merge request gitlab/gitlabhq!3267
 2019-08-29 21:34:15 +00:00
GitLab Release Tools Bot a5b2a37860 Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master' 
Require a captcha after unique failed logins from the same IP

See merge request gitlab/gitlabhq!3270
 2019-08-29 21:34:12 +00:00
GitLab Release Tools Bot 7d6edff6f3 Merge branch 'security-project-import-bypass' into 'master' 
Project visibility restriction bypass

See merge request gitlab/gitlabhq!3306
 2019-08-29 21:34:04 +00:00
GitLab Release Tools Bot a69aebcd2c Merge branch 'security-add-job-activity-limit-ce' into 'master' 
Introduce JobActivity limit for alive jobs

Closes gitlab-ee#376

See merge request gitlab/gitlabhq!3339
 2019-08-29 21:33:50 +00:00
GitLab Release Tools Bot 61c9f07802 Merge branch 'security-fix-markdown-xss' into 'master' 
Re-escape the whole HTML content when finding HTML references

See merge request gitlab/gitlabhq!3340
 2019-08-29 21:33:47 +00:00
GitLab Release Tools Bot df556bf2f6 Merge branch 'security-exposed-default-branch' into 'master' 
Avoid exposing unaccessible repo data upon GFM post processing

See merge request gitlab/gitlabhq!3344
 2019-08-29 21:33:45 +00:00
Sarah Yasonik 94720682a1 Add a close issue slack slash command 
Adds a slash command in slach for closing issues. See
https://docs.gitlab.com/ee/integration/slash_commands.html
for documentation on the wider feature set.
 2019-08-29 20:27:38 +00:00
Nick Thomas c6ccc07f48
Revert "Cache branch and tag names as Redis sets" 
This reverts commit 0eff75fa2b.
 2019-08-29 18:04:52 +01:00
Nick Thomas 4e2af302f6 Merge branch '60071-remove-gitlab-keys-usage' into 'master' 
Remove usage of gitlab-shell gitlab-keys script

See merge request gitlab-org/gitlab-ce!32138
 2019-08-29 14:26:09 +00:00
Yorick Peterse e8dd299e7c
Improve chatops help output 
This improves the output produced when running an unknown command,
running the "help" command, and when trying to run a command you are not
allowed to run. The new help output includes links to the project of the
chatops integration, and a link to the chatops documentation.
 2019-08-29 16:11:42 +02:00
Kamil Trzciński 955e23d956 Merge branch 'sh-support-content-for-snippets-api' into 'master' 
Standardize use of `content` parameter in snippets API

Closes #66673

See merge request gitlab-org/gitlab-ce!32296
 2019-08-29 11:33:48 +00:00
Patrick Bajao a1ec2ad0b2 Auto create authorized_keys file if doesn't exist 
Utilize the auto repair functionality of system checks.
 2019-08-29 16:33:04 +08:00
Patrick Bajao 0e33f16b5f Add system check for authorized_keys file perm 
This check is being removed from gitlab-shell as the file
is now being managed by gitlab-rails.
 2019-08-29 16:33:04 +08:00