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
87,758 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

87758 Commits

Author SHA1 Message Date
Rémy Coutable 3a2abc1d50
Enable the Layout/ExtraSpacing cop 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-01-24 13:05:45 +01:00
Rémy Coutable 16ab0050f6 Merge branch 'qa/testing/cng/189' into 'master' 
Improve the handling of tags and branches which contains a `/` when triggering CNG pipelines

See merge request gitlab-org/gitlab-ce!24465
 2019-01-24 11:53:41 +00:00
Rémy Coutable 8ea0bbb000 Merge branch '54385-board-policy-ce' into 'master' 
Backport of 54385-board-policy

Closes #54385

See merge request gitlab-org/gitlab-ce!24475
 2019-01-24 11:52:10 +00:00
Kushal Pandya c665e6eb40 Merge branch '56556-fix-markdown-table-border' into 'master' 
Fix markdown table border

Closes #56556

See merge request gitlab-org/gitlab-ce!24601
 2019-01-24 11:39:19 +00:00
Jacques Erasmus 0a27853e82 Fix markdown table border 2019-01-24 11:39:19 +00:00
Phil Hughes 490eeb5159 Merge branch '8621-new-feature-flag-vue-ce-backport' into 'master' 
Adds extra sizes in responsive tables

See merge request gitlab-org/gitlab-ce!24605
 2019-01-24 09:03:40 +00:00
Rémy Coutable aebc47256a Merge branch '56763-docs-lint-passes-if-a-relative-link-starts-with-doc-docs' into 'master' 
Resolve "Docs lint passes if a relative link starts with /doc"

Closes #56763

See merge request gitlab-org/gitlab-ce!24613
 2019-01-24 07:49:27 +00:00
Rémy Coutable f8a10191f0
Use $CI_COMMIT_REF_NAME for tags in trigger-build 
Also, pass GITLAB_VERSION and GITLAB_ASSETS_TAG to CNG triggered
pipelines.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-01-24 08:43:11 +01:00
Rémy Coutable 67dfd8786b
Use $CI_COMMIT_REF_SLUG in review-apps.sh 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-01-24 08:42:45 +01:00
Rémy Coutable 039e41eda0 Merge branch 'qa-quarantine-auto-dev-ops-tests' into 'master' 
Quarantine Auto DevOps tests

See merge request gitlab-org/gitlab-ce!24623
 2019-01-24 07:36:29 +00:00
Achilleas Pipinellis 97aa25ba8b Merge branch 'docs/document-built-in-templates' into 'master' 
Restructure projects template topics

Closes #55834

See merge request gitlab-org/gitlab-ce!24448
 2019-01-24 06:56:42 +00:00
Evan Read 2b47e4d480 Restructure projects template topics 2019-01-24 06:56:42 +00:00
Achilleas Pipinellis 2e36b0d7a6 Merge branch 'docs/fix-bare-urls' into 'master' 
Fix most instances of bare URLs in markdown

See merge request gitlab-org/gitlab-ce!24519
 2019-01-24 06:52:33 +00:00
Evan Read c2c2d04b3a Fix most instances of bare URLs in markdown 2019-01-24 06:52:33 +00:00
Sanad Liaquat 7f49f01c14 Quarantine auto devops tests 2019-01-24 11:06:45 +05:00
Stan Hu 7d11049237 Merge branch 'if-log_user_admin_status' into 'master' 
Log admin status of user when OAuth::User is saved

See merge request gitlab-org/gitlab-ce!24602
 2019-01-24 05:20:18 +00:00
Evan Read 5cc49c16b8 Merge branch 'patch-40' into 'master' 
Update repository_mirroring.md

See merge request gitlab-org/gitlab-ce!24586
 2019-01-24 04:25:27 +00:00
Evan Read bef92cf270 Merge branch 'docs-push-mirror-GitLab-GitHub' into 'master' 
(docs) Updated fields information for push mirror from GitLab to GitHub

See merge request gitlab-org/gitlab-ce!24566
 2019-01-24 04:21:16 +00:00
Nick Thomas 0a1c9b9b34 Merge branch 'fix-loose-typo' into 'master' 
Fix 'loose' typo

Closes #56248

See merge request gitlab-org/gitlab-ce!24330
 2019-01-24 00:23:19 +00:00
Nick Thomas a949043df7 Merge branch 'sh-fix-upload-snippets-with-relative-url-root' into 'master' 
Fix 404s for snippet uploads when relative URL root used

Closes #56280

See merge request gitlab-org/gitlab-ce!24588
 2019-01-24 00:07:14 +00:00
Robert Speicher de3af288ce Merge branch 'sh-remove-bitbucket-mirror-constant' into 'master' 
Fix import handling errors in Bitbucket Server importer

See merge request gitlab-org/gitlab-ce!24499
 2019-01-23 23:49:42 +00:00
Stan Hu 3effc289ca Merge branch 'custom-gitaly-url' into 'master' 
Allow Gitaly to be built from a custom URL

See merge request gitlab-org/gitlab-ce!24616
 2019-01-23 21:49:28 +00:00
Douglas Barbosa Alexandre 8d90f81731 Merge branch 'sh-fix-issue-9357' into 'master' 
Fix 500 errors with legacy appearance logos

Closes gitlab-ee#9357

See merge request gitlab-org/gitlab-ce!24615
 2019-01-23 20:42:56 +00:00
Nick Thomas 3ee9bca503
Allow Gitaly to be built from a custom URL 2019-01-23 20:37:02 +00:00
Nick Thomas f40e769211 Merge branch '52674-api-v4-projects-project_id-jobs-endpoint-hits-statement-timeout' into 'master' 
[API] Omit `X-Total` and `X-Total-Pages` headers when items count is more than 10,000

Closes #42194 and #52674

See merge request gitlab-org/gitlab-ce!23931
 2019-01-23 19:27:09 +00:00
Stan Hu 19f9d99870 Fix 500 errors with legacy appearance logos 
Prior to GitLab 9.0, attachments were not tracked the `uploads` table,
so it was possible that the appearance logos were just stored in the
database as a string and mounted via CarrierWave.

https://gitlab.com/gitlab-org/gitlab-ce/issues/29240 implemented in
GitLab 10.3 was supposed to cover populating the `uploads` table for all
attachments, including all the logos from appearances. However, it's
possible that didn't work for logos or the `uploads` entry was orphaned.

GitLab instances that had a customized logo with no associated `uploads`
entry would see Error 500s. The only way to fix this is to delete the
`logo` column from the `appearances` table and re-upload the attachment.

This change makes things more robust by falling back to the original
behavior if the upload is not available.

This is a CE backport of
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9277.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9357
 2019-01-23 11:18:00 -08:00
Marcia Ramos c051fe6ebd Merge branch '56514-docs-feedback-add-git-clone-to-list-of-basic-git-commands' into 'master' 
documentation: Add `git clone` to list of basic git commands

Closes #56514

See merge request gitlab-org/gitlab-ce!24474
 2019-01-23 18:54:28 +00:00
Achilleas Pipinellis 9060941162
Use the same path of the docs site as in production 
This started with
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24339 where a
broken link was introduced, but the lint checker never caught it.

The docs-lint job does the following:

```yaml
  script:
    - mv doc/ /tmp/gitlab-docs/content/
    - cd /tmp/gitlab-docs
    # Build HTML from Markdown
    - bundle exec nanoc
    # Check the internal links
    - bundle exec nanoc check internal_links
```

It moves the `doc/` dir inside `content` where Nanoc is expecting the
markdown files to be. It then builds the site and finally checks for
the links. If the built website was deployed to production, that would
be under `docs.gitlab.com/doc`.

The interesting part here is that
`[the logs](/doc/administration/logs.md#productionlog)`
translates to `<a href="/doc/administration/logs.html#productionlog>`,
so, Nanoc correctly sees this as an existing file!

This MR changes the path of the docs content to be equal to
$DOCS_GITLAB_REPO_SUFFIX which is defined as an environment
variable and takes the value of the slug of each project:
'ce', 'ee', 'omnibus', 'runner'.
 2019-01-23 19:24:25 +01:00
Rémy Coutable 768475bd78 Merge branch 'improve-review-apps-docs' into 'master' 
Improve Review Apps documentation

See merge request gitlab-org/gitlab-ce!24597
 2019-01-23 17:49:26 +00:00
Mark Lapierre 19add9218c Merge branch 'qa-staging-27' into 'master' 
[QA] Use public_email instead of email since it's available

Closes gitlab-org/quality/staging#27

See merge request gitlab-org/gitlab-ce!24533
 2019-01-23 17:49:14 +00:00
Joseph Yu 1542787a53 Amended with suggestions by @eread 2019-01-23 17:40:15 +00:00
Marcia Ramos 07030da37a Add brief description, fix typo, comply with docs style guide 2019-01-23 17:09:19 +00:00
Max Raab 3a46e719df Revert changes to *.po files 2019-01-23 18:02:46 +01:00
Marcia Ramos cec68cb709 Merge branch 'docs/fix-broken-link' into 'master' 
Fix broken docs link

Closes #56754

See merge request gitlab-org/gitlab-ce!24611
 2019-01-23 16:33:40 +00:00
Andrew Fontaine ccf97bef37 Address Feedback from Docs Team 
Clarify `ssh` and `https` cloning, as well as where to find the `url`s
to those repositories.
 2019-01-23 11:16:48 -05:00
Achilleas Pipinellis fdac9ebdcf
Fix broken docs link 2019-01-23 17:13:01 +01:00
Rémy Coutable 29e5cd5f8d
Improve Review Apps documentation 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-01-23 16:47:46 +01:00
Filipa Lacerda d25fd03308 Adds extra sizes in responsive tables 
Adds two extra column sizes in the responsive
tables css
 2019-01-23 14:56:49 +00:00
Phil Hughes 8ae38ca2b7 Merge branch 'fix/55956-oversized-dropdown-button-custom-notifications' into 'master' 
Added `btn_class` to the dropdown for custom notifications

See merge request gitlab-org/gitlab-ce!24557
 2019-01-23 13:58:15 +00:00
Ezekiel Kigbo b509021bfc Added `btn_class` to the dropdown for custom notifications 2019-01-23 13:58:15 +00:00
Imre Farkas 157b385411
Log admin status of user when OAuth::User is saved 2019-01-23 14:26:15 +01:00
Filipa Lacerda c243b154ab Merge branch 'gt-externalize-app-views-sent_notifications' into 'master' 
Externalize strings from `/app/views/sent_notifications`

See merge request gitlab-org/gitlab-ce!24576
 2019-01-23 13:07:38 +00:00
Kamil Trzciński e8f73aaee6 Merge branch '56417-update-helm-to-2-12-2' into 'master' 
Update Helm to 2.12.2 to address Helm client vulnerability

Closes #56417

See merge request gitlab-org/gitlab-ce!24418
 2019-01-23 12:30:06 +00:00
Rémy Coutable cbc3d1f911
[QA] Use public_email instead of email since it's available 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-01-23 13:17:05 +01:00
George Tsiolis 17e43bfb11 Externalize strings from `/app/views/sent_notifications` 2019-01-23 13:41:33 +02:00
Lin Jen-Shin cae2330b54 Merge branch '56731-wait_for_job_to_be_done-gitlab-assets-compile-fails-in-the-review-build-cng-job' into 'master' 
Resolve "`wait_for_job_to_be_done "gitlab:assets:compile"` fails in the `review-build-cng` job"

Closes #56731

See merge request gitlab-org/gitlab-ce!24598
 2019-01-23 11:36:00 +00:00
Filipa Lacerda 3ed8078507 Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master' 
Resolve "Changing wording to "Delete" when referring to removing a branch"

Closes #25569

See merge request gitlab-org/gitlab-ce!23966
 2019-01-23 11:02:22 +00:00
Drew Blessing da251c6436 Merge branch 'docs-slack-troubleshooting' into 'master' 
Add troubleshooting section to Slack Notification Service

See merge request gitlab-org/gitlab-ce!24339
 2019-01-23 09:25:59 +00:00
Rémy Coutable b8843fff37
Set API_TOKEN in the review-build-cng job 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-01-23 10:24:47 +01:00
Phil Hughes 52ceda4479 Merge branch 'dm-trim-discussion-truncated-line-first-chars' into 'master' 
Fix bug that caused Suggestion Markdown toolbar button to insert snippet with leading +/-/<space>

See merge request gitlab-org/gitlab-ce!24568
 2019-01-23 08:45:17 +00:00