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

101375 Commits

Author SHA1 Message Date
Evan Read 60adc14473 Merge branch 'docs-align-for-single-codebase' into 'master' 
Realign 3 docs that diverged between ce/ee

See merge request gitlab-org/gitlab-ce!32513
 2019-09-02 02:35:07 +00:00
Marcel Amirault 70a16ebc97 Realign 3 docs that diverged between ce/ee 2019-09-02 02:35:06 +00:00
Thong Kuah 237de5c728 Expand textarea for CA cert in cluster form 
The current default is too small
for a user to see what they have pasted in.
 2019-09-02 14:13:54 +12:00
Evan Read 22e765b2cc Merge branch 'docs-quick-actions-followup' into 'master' 
Adjust table entries in quick actions doc

Closes #66256

See merge request gitlab-org/gitlab-ce!32038
 2019-09-02 02:08:48 +00:00
Marcel Amirault 108473fa69 Update quick actions table and combine with epics 
Also fix links to renamed headers and moved content
 2019-09-02 02:08:47 +00:00
Evan Read bb99271147 Merge branch 'docs-shrink-gifs' into 'master' 
Crop, trim and  compress animated gifs

See merge request gitlab-org/gitlab-ce!32511
 2019-09-02 01:55:15 +00:00
Marcel Amirault 3345d6048b Crop, trim and compress animated gifs 2019-09-02 01:55:14 +00:00
Evan Read 00b26a7cc4 Merge branch 'docs/convert-code-quality-gif-to-png' into 'master' 
Convert 'code quality' GIF to PNG

See merge request gitlab-org/gitlab-ce!32510
 2019-09-02 01:37:25 +00:00
Russell Dickenson 35b12e1ecb Convert 'code quality' GIF to PNG 
Image converted to reduce file size.
 2019-09-02 01:37:24 +00:00
Ash McKenzie 39bb3f6772 Merge branch 'update-workhorse' into 'master' 
Update GitLab Workhorse to v8.10.0

See merge request gitlab-org/gitlab-ce!32501
 2019-09-02 01:33:00 +00:00
Evan Read 0bbbc86027 Merge branch 'docs/reduce-code-quality-image-size' into 'master' 
Replaced image with smaller version

See merge request gitlab-org/gitlab-ce!32509
 2019-09-02 01:25:37 +00:00
Russell Dickenson 236dcc4f92 Replaced image with smaller version 
The size of this image was reduced to:

1. Reduce its storage size.
2. Optimze for faster loading in browser.
 2019-09-02 01:25:35 +00:00
Ash McKenzie 53f9dc63da Merge branch 'pb-update-shell-version-9-4-2' into 'master' 
Update gitlab-shell to v9.4.2

See merge request gitlab-org/gitlab-ce!32505
 2019-09-02 01:17:08 +00: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
Evan Read eaae9cec21 Merge branch 'docs-size-limit-per-repository' into 'master' 
Documentation: Describe where to set "Size limit per repository" for projects and groups

See merge request gitlab-org/gitlab-ce!31856
 2019-09-02 00:20:59 +00:00
Evan Read fb5b182c6a Merge branch 'markdownlint-wildcard' into 'master' 
Change markdownlint wildcard format

See merge request gitlab-org/gitlab-ce!32379
 2019-09-02 00:19:31 +00:00
Marcel Amirault 61199b7413 Change markdownlint wildcard format 2019-09-02 00:19:30 +00:00
Evan Read c0733f43a6 Merge branch 'doc_applications' into 'master' 
Improve document format, putting parameters in a table

See merge request gitlab-org/gitlab-ce!31905
 2019-09-01 23:55:52 +00:00
Alexis Sánchez ea12914445 Improve document format, putting parameters in a table 2019-09-01 23:55:51 +00:00
Evan Read 74a7edd116 Merge branch 'doc_releases' into 'master' 
Improve RAW reading, consistency in api uri

See merge request gitlab-org/gitlab-ce!31941
 2019-09-01 23:45:32 +00:00
Alexis Sánchez e6d6f83539 Improve RAW reading, consistency in api uri 2019-09-01 23:45:31 +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
Patrick Bajao 1dc24c059e Update gitlab-shell to v9.4.2 2019-09-01 22:48:38 +08:00
Nick Thomas 750a25cf2f Merge branch '66139-remove-kubernetes_namespace_per_environment-feature-flag' into 'master' 
Remove :kubernetes_namespace_per_environment feature flag

See merge request gitlab-org/gitlab-ce!32140
 2019-09-01 13:42:20 +00:00
Stan Hu 67b4448e37 Merge branch 'remove-unnecessary-freeze-in-app-models' into 'master' 
Avoid calling freeze on already frozen strings in app/models

See merge request gitlab-org/gitlab-ce!32499
 2019-09-01 13:20:26 +00:00
Stan Hu 72d39e3d8c Merge branch 'remove-unnecessary-freeze-in-app-controllers' into 'master' 
Avoid calling freeze on already frozen strings in app/controllers

See merge request gitlab-org/gitlab-ce!32498
 2019-09-01 13:18:41 +00:00
Stan Hu af4312f1d8 Update Mermaid to v8.2.6 
This fixes a regression where an underscore in labels no
longer worked:
https://github.com/knsv/mermaid/releases
 2019-09-01 06:08:35 -07: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
Nick Thomas dcc680d516
Update GitLab Workhorse to v8.10.0 2019-09-01 13:38:43 +01:00
Stan Hu bff1b4f0d7 Merge branch 'patch-74' into 'master' 
Fix spelling of "poiting"

See merge request gitlab-org/gitlab-ce!32494
 2019-09-01 03:51:15 +00:00
Paul Slaughter bfed409d37 Merge branch 'refactor/showStagedIcon' into 'master' 
Refactor showStagedIcon property's behavior to match its name

Closes #66071

See merge request gitlab-org/gitlab-ce!32333
 2019-09-01 02:58:31 +00:00
dineshpanda 980303b542 Avoid calling freeze on already frozen strings in app/controllers 2019-09-01 01:57:25 +05:30
dineshpanda 20111b045d Avoid calling freeze on already frozen strings in app/models 2019-09-01 01:27:00 +05:30
John Jago ff04c99bf8 Fix spelling of "poiting" 2019-08-31 18:59:36 +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
Stan Hu dc86492724 Merge branch 'qa-fix-qa-project-show-page-object' into 'master' 
Add EE methods to Project Show page object

See merge request gitlab-org/gitlab-ce!32489
 2019-08-31 11:36:34 +00:00
Jennifer Louie aedcedd0f5 Add EE methods to Project Show page object 2019-08-31 11:36:33 +00:00
Lin Jen-Shin 195ac30514 Merge branch 'update-jira-ruby-to-1.7.1' into 'master' 
Update jira-ruby to 1.7.1

See merge request gitlab-org/gitlab-ce!32436
 2019-08-31 09:55:20 +00:00
Takuya Noguchi 1c0f04cced Always use HTTPS sources for NPM modules in yarn.lock 
Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28445

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
 2019-08-31 18:47:47 +09:00
sstern 5f3a597096 Add argument to catch 2019-08-30 15:57:49 -07:00
Tanya Pazitny ce6dbc57cf Merge branch 'qa/increase-window-size-during-e2e-tests' into 'master' 
Increase window size during e2e tests

See merge request gitlab-org/gitlab-ce!32471
 2019-08-30 22:44:48 +00:00
Arun Kumar Mohan 9575288f62 Refactor showStagedIcon property's behavior to match its name 
Previously, the `showStagedIcon` property was doing the opposite
of what its name suggested. It was rendering the staged icon when
`showStagedIcon` was `false` and rendering the regular icon when
it was `true`.
 2019-08-30 17:08:16 -05:00
Michael Kozono 88c6423e4a Merge branch 'remove-ignorable-column-concern' into 'master' 
Remove dependency on IgnorableColumn concern

Closes #66746

See merge request gitlab-org/gitlab-ce!32427
 2019-08-30 21:59:31 +00:00
Mayra Cabrera 1495a84cb7 Merge branch '66454-create-feature-flag' into 'master' 
Creates Feature Flag for job log

See merge request gitlab-org/gitlab-ce!32154
 2019-08-30 21:51:31 +00:00
Filipa Lacerda 288e709cb7 Creates Feature Flag for job log 
Updates frontend code and specs to allow for the new
feature flag
 2019-08-30 21:51:30 +00:00
Robert Speicher e5398754a6 Merge branch '12055-public-mr-approval-rules-api-ce' into 'master' 
Doc: Add documentation about public MR-level API

See merge request gitlab-org/gitlab-ce!32133
 2019-08-30 21:35:23 +00:00
Mayra Cabrera 29fdab0ae1 Merge branch '28643-access-request-emails-limit-to-ten-owners' into 'master' 
Resolve "Limit access request emails to ten most recently active owners/maintainers"

See merge request gitlab-org/gitlab-ce!32141
 2019-08-30 21:30:52 +00:00
Manoj MJ b943baa42a Limit access request email to 10 most recently active owners/maintainers 
This change limits the number of emails
for new access requests notifications to
10 most recently active owners/maintainers
 2019-08-30 21:30:51 +00:00
Stan Hu d93b985df0 Use self.ignored_columns += instead of = 
This is to accomodate prepended modules.
 2019-08-30 13:15:34 -07:00
Desiree Chevalier d3293e49e8 Backport EE changes for built-in project template test 2019-08-30 15:18:07 -04:00