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

102125 Commits

Author SHA1 Message Date
Evan Read fc01371fbe Merge branch 'docs-project-membership-mpenna20190906' into 'master' 
Docs: Clarified project membership terminology

See merge request gitlab-org/gitlab-ce!32784
 2019-09-12 02:58:08 +00:00
Matt Penna 1fea6cccd4 Docs: Clarified project membership terminology 2019-09-12 02:58:07 +00:00
Ray Paik a52935fbd8 Merge branch 'patch-72' into 'master' 
Update a dead external link in documentation

See merge request gitlab-org/gitlab-ce!32939
 2019-09-12 02:45:57 +00:00
Evan Read 1cef292cd1 Merge branch 'docs-prot-branches-mpenna20190906' into 'master' 
Docs: Clarified wording to match Permissions doc

See merge request gitlab-org/gitlab-ce!32786
 2019-09-12 02:33:38 +00:00
Matt Penna 2b9a8de11a Docs: Clarified wording to match Permissions doc 2019-09-12 02:33:32 +00:00
Evan Read b3d5dac9c0 Merge branch 'docs-permissions-clarify-mpenna20190906' into 'master' 
Docs: Clarified permissions of protected branches

See merge request gitlab-org/gitlab-ce!32785
 2019-09-12 02:29:57 +00:00
Matt Penna cf65b4c56a Docs: Clarified permissions of protected branches 2019-09-12 02:29:56 +00:00
Mike Lewis 5587ccfdc2 Merge branch 'docs-update-vetur-vscode-extension' into 'master' 
Update outdated instructions for vetur in vscode

Closes #66733

See merge request gitlab-org/gitlab-ce!32480
 2019-09-12 01:09:53 +00:00
Mike Lewis 9dc6df4feb Merge branch 'docs-sethgitlab-documentationwf' into 'master' 
Update documentation requirements

See merge request gitlab-org/gitlab-ce!32222
 2019-09-12 00:57:08 +00:00
Seth Berger 47a26caff2 Apply suggestion to doc/development/documentation/feature-change-workflow.md 2019-09-12 00:50:45 +00:00
Thong Kuah a3d836c9f7 Merge branch '8605-support-san-extension' into 'master' 
Backport of ee/15773: Allow SmartCard authentication to use SAN extensions

See merge request gitlab-org/gitlab-ce!32581
 2019-09-12 00:50:18 +00:00
Sebastián Arcila Valenzuela ca2123429e Backport of ee/15773: Allow SmartCard authentication to use SAN extensions 2019-09-12 00:50:17 +00:00
Seth Berger 7d2c2cc3c5 Apply suggestion to doc/development/documentation/feature-change-workflow.md 2019-09-12 00:49:57 +00:00
Seth Berger 17451e8ce8 Apply suggestion to doc/development/documentation/feature-change-workflow.md 2019-09-12 00:47:39 +00:00
Mayra Cabrera 3c372d87a7 Merge branch 'sh-fix-removed-support-bot-column' into 'master' 
Ignore support_bot column in users table

Closes #67295

See merge request gitlab-org/gitlab-ce!32933
 2019-09-12 00:24:50 +00:00
Mark Lapierre b966e9e027 Merge branch 'qa-ml-refactor-protected-branch-test' into 'master' 
Refactor protected branch resource and spec

See merge request gitlab-org/gitlab-ce!32689
 2019-09-11 22:48:35 +00:00
Thong Kuah eef1a7fe2c Merge branch 'static-objects-external-storage' into 'master' 
Enable serving static objects from an external storage

See merge request gitlab-org/gitlab-ce!31025
 2019-09-11 22:35:10 +00:00
Thong Kuah 6c89bc7eae Merge branch 'ce-indicator-for-pipeline-for-merge-train' into 'master' 
CE backport for gitlab-org/gitlab-ee!14664: Show indicator to Pipelines for merge train

See merge request gitlab-org/gitlab-ce!32025
 2019-09-11 21:44:16 +00:00
Freezed 2f236c206e Update a dead external link 2019-09-11 21:22:15 +00:00
Thong Kuah 76c0af2917 Merge branch '14671-analytics-feature-flags' into 'master' 
Update feature flag name for Cycle Analytics

See merge request gitlab-org/gitlab-ce!32641
 2019-09-11 20:41:06 +00:00
Adam Hegyi a40f6000b6 Update feature flag name for Cycle Analytics 
https://gitlab.com/gitlab-org/gitlab-ee/issues/14671
 2019-09-11 20:41:05 +00:00
Annabel Dunstone Gray a282fbcd48 Merge branch '67248-snippet-title-whitespace' into 'master' 
Resolve "Snippet title whitespace"

Closes #67248

See merge request gitlab-org/gitlab-ce!32877
 2019-09-11 20:17:46 +00:00
Marcel van Remmerden e75035b721 Add bottom margin to snippet title 2019-09-11 20:17:45 +00:00
Brett Walker ae862960b1 Bump the CACHE_COMMONMARK_VERSION 
to ensure any markdown generated before the asset
proxy default was corrected is re-generated
 2019-09-11 14:35:37 -05:00
Mayra Cabrera 9ac48b4e25 Merge branch 'feature-enhance-pipeline-webhook' into 'master' 
Add source and merge_request fields to pipeline event webhook

Closes #63338

See merge request gitlab-org/gitlab-ce!32373
 2019-09-11 19:33:46 +00:00
Bian Jiaping 9c0e2d5b47 Add source and merge_request fields to pipeline event webhook 2019-09-11 19:33:45 +00:00
Mayra Cabrera 3fb6824892 Merge branch '9931-github-integration-default-static-status-check-names' into 'master' 
Update documentation for GitHub integration

See merge request gitlab-org/gitlab-ce!32385
 2019-09-11 19:24:07 +00:00
Marius Bobin 7f6ebd4fb2 Update documentation for GitHub integration 
Update docs to reflect the new default behavior
for status check names
 2019-09-11 19:24:06 +00:00
Kamil Trzciński 1c62d1127c Merge branch '66637-use-chronic-duration-in-thread-safe-way' into 'master' 
Use `ChronicDuration` in a thread-safe way

See merge request gitlab-org/gitlab-ce!32817
 2019-09-11 18:32:25 +00:00
Aleksei Lipniagov 50cb6eca57 Use 'gitlab_chronic_duration' gem 
Replace 'chronic_duration' to 'gitlab_chronic_duration', to make
relevant method calls thread-safe.
 2019-09-11 18:32:24 +00:00
Stan Hu c816e76820 Ignore support_bot column in users table 
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32554 removed the
support_bot column, but nodes were not told to ignore this column.
As a result, after the post-deploy migration ran, nodes attempted
to use this column, causing 500 errors.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67295
 2019-09-11 11:28:25 -07:00
Rémy Coutable 6db9cbfe77 Merge branch '26893-ee-fix-scheduled-review-app-needs' into 'master' 
Fix review pipeline needs blocking scheduled deploys

Closes #26893 and gitlab-ee#26893

See merge request gitlab-org/gitlab-ce!32925
 2019-09-11 16:57:03 +00:00
Mike Greiling fb72c5db14 Merge branch 'add-missing-render-gfm' into 'master' 
Add missing `render_gfm` import to files

See merge request gitlab-org/gitlab-ce!32830
 2019-09-11 16:47:20 +00:00
Illya Klymov 2d94e2c913 Add missing `render_gfm` import to files 2019-09-11 16:47:19 +00:00
Mike Greiling c256adb74e Merge branch 'winh-vue-resource-markdown-field' into 'master' 
Replacing vue-resource with axios in Markdown field

Closes #61385

See merge request gitlab-org/gitlab-ce!32742
 2019-09-11 16:45:41 +00:00
Winnie Hellmann d956f68a39 Replacing vue-resource with axios in Markdown field 2019-09-11 16:45:39 +00:00
Clement Ho 1a5c262a74 Merge branch '65698-monitor-webpack-dev-server-memory' into 'master' 
Add webpack memory test to CI

Closes #65698

See merge request gitlab-org/gitlab-ce!31537
 2019-09-11 16:36:19 +00:00
Mike Greiling 1c621da362 Add webpack memory test to CI 2019-09-11 16:36:18 +00:00
Enrique Alcantara bf37e08634
Include AWS SDK as packge dependency 
- Load EKS create cluster form as dynamic import dependency.
- Include aws-sdk dependency in package.json
 2019-09-11 12:28:54 -04:00
Douglas Barbosa Alexandre 70302281d7 Merge branch 'pl-remove-ignored-columns-task' into 'master' 
Add rake task `db:obsolete_ignored_columns`

See merge request gitlab-org/gitlab-ce!32904
 2019-09-11 16:23:43 +00:00
Peter Leitzen 50c647af51 Add rake task `db:obsolete_ignored_columns` 
Show a list of obsolete `ignored_columns`
 2019-09-11 16:23:42 +00:00
James Lopez 0abc902576 Merge branch 'countries_option' into 'master' 
Back port changes for country list Api

See merge request gitlab-org/gitlab-ce!32688
 2019-09-11 16:02:13 +00:00
Aishwarya Subramanian 54b51d956e Back port changes for country list Api 2019-09-11 16:02:11 +00:00
Rémy Coutable 3ffdae92b3 Merge branch 'backport-add-current-user-compare-services-ce' into 'master' 
Backport changes for 16252 in EE add current_user to report comparison services

See merge request gitlab-org/gitlab-ce!32920
 2019-09-11 15:33:51 +00:00
Can Eldem 0a5bce6e4f Backport changes for 16252 in EE add current_user to report comparison services 2019-09-11 15:33:50 +00:00
Enrique Alcantara 15096b01c6
Remove service credentials object 2019-09-11 11:28:05 -04:00
Enrique Alcantara d7a3e6c41f
Create EKS cluster Vue app skeleton 
- Add AWS SDK Dependency
- Create placeholders for Vue components
- Create store with state structure
 2019-09-11 11:28:05 -04:00
Paul Slaughter f95857c8c5 Merge branch 'add-missing-vuex-use' into 'master' 
Add missing Vue.use(Vuex) in test

See merge request gitlab-org/gitlab-ce!32837
 2019-09-11 15:27:54 +00:00
Kyle Wiebers d2507c6dc2 Fix review pipeline needs blocking scheduled deploys 2019-09-11 10:23:34 -05:00
Douglas Barbosa Alexandre b7b2207e01
Update Geo HA docs to recommend Gitaly over NFS 2019-09-11 11:51:29 -03:00