summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add docs on post-merge pipelinesdocs/post-merge-pipelinesAchilleas Pipinellis2018-11-202-2/+30
|
* Merge branch '53972-fix-fill-shards' into 'master'Stan Hu2018-11-132-6/+10
|\ | | | | | | | | | | | | Fix a race condition in the shard population logic Closes #53972 See merge request gitlab-org/gitlab-ce!23028
| * Fix a race condition intermittently breaking GitLab startupNick Thomas2018-11-132-6/+10
| |
* | Merge branch 'sh-bump-ruby-2.5.3' into 'master'Rémy Coutable2018-11-134-11/+18
|\ \ | | | | | | | | | | | | | | | | | | Upgrade to Ruby 2.5.3 Closes #41825 See merge request gitlab-org/gitlab-ce!22555
| * | Upgrade to Ruby 2.5.3sh-bump-ruby-2.5.3Stan Hu2018-11-134-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to update google-protobuf for migration-paths Because the one we were using aren't compatible with Ruby 2.5.3, and it'll be troublesome to switch Ruby. Upgrading google-protobuf will be much easier. All of them will need to be updated for Ruby 2.5.3 We remove oj because we don't really need it and it doesn't compile on 2.5.3 with that version. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41825
* | | Merge branch 'enable-image-comments-for-renamed-files' into 'master'Filipa Lacerda2018-11-132-2/+25
|\ \ \ | | | | | | | | | | | | | | | | Fixed image commenting on moved files See merge request gitlab-org/gitlab-ce!23023
| * | | Fixed image commenting on moved filesPhil Hughes2018-11-132-2/+25
| | | |
* | | | Merge branch '53780-commit-discussion-ui' into 'master'Fatih Acet2018-11-135-22/+40
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix broken UI on commit discussions Closes #53780 See merge request gitlab-org/gitlab-ce!22952
| * | | Fix broken UI on commit discussionsAnnabel Dunstone Gray2018-11-135-22/+40
|/ / /
* | | Merge branch ↵Rémy Coutable2018-11-131-6/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53812-review-apps-check-whether-release-exists-before-attempting-stop_review' into 'master' Ensure we abort the cleanup if release is empty Closes #53812 See merge request gitlab-org/gitlab-ce!22992
| * | | Ensure we abort the cleanup if release is emptyRémy Coutable2018-11-131-6/+20
| | |/ | |/| | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '_acet-discussion-redesign-fixes' into 'master'Annabel Dunstone Gray2018-11-131-4/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Border radius fixes for redesigned discussions Closes #53880 and #53767 See merge request gitlab-org/gitlab-ce!23006
| * | | Border radius fixes for redesigned discussions_acet-discussion-redesign-fixesFatih Acet2018-11-131-4/+1
| | | |
* | | | Merge branch '51259-tooltip' into 'master'Phil Hughes2018-11-131-24/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Updates ci header component with gitlab-ui See merge request gitlab-org/gitlab-ce!23000
| * | | | Updates ci header component with gitlab-ui51259-tooltipFilipa Lacerda2018-11-131-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | It reuses loading button instead of creating a new loading button It uses the new gitlab-ui components
* | | | | Merge branch 'docs-jivl-update-monitoring-urls' into 'master'Clement Ho2018-11-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update URL for the grafana instance of sitespeed See merge request gitlab-org/gitlab-ce!23001
| * | | | | Update URL for the grafana instance of sitespeeddocs-jivl-update-monitoring-urlsJose Vargas2018-11-121-1/+1
| | | | | |
* | | | | | Merge branch 'docs/update-prepend-documentation' into 'master'Achilleas Pipinellis2018-11-131-29/+124
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs to put prepend as the last line Closes #53919 See merge request gitlab-org/gitlab-ce!23017
| * | | | | | Update docs to put prepend as the last linedocs/update-prepend-documentationYorick Peterse2018-11-131-29/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the documentation for adding EE specific features to clarify that `prepend` should be on the last line, and how to deal with code that depends on class methods redefined in EE. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/53919
* | | | | | | Merge branch 'winh-frontend-testing-categories-docs' into 'master'Tim Zallmann2018-11-131-42/+236
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation about frontend test categories to frontend guide See merge request gitlab-org/gitlab-ce!21344
| * | | | | | | Make it explicit that we are referencing official Vue guidelinesWinnie Hellmann2018-11-131-1/+1
| | | | | | | |
| * | | | | | | Replace "need not" with "don't"Winnie Hellmann2018-11-131-1/+1
| | | | | | | |
| * | | | | | | Fix heading levelsWinnie Hellmann2018-10-261-2/+3
| | | | | | | |
| * | | | | | | Remove section about types of testsWinnie Hellmann2018-10-261-14/+0
| | | | | | | |
| * | | | | | | Remove section about Karma testsWinnie Hellmann2018-10-261-24/+5
| | | | | | | |
| * | | | | | | Remove section about RSpec testsWinnie Hellmann2018-10-261-42/+0
| | | | | | | |
| * | | | | | | Describe categories of frontend testing in testing guidelinesWinnie Hellmann2018-10-261-0/+268
| | | | | | | |
* | | | | | | | Merge branch 'docs-document_new_reports_syntax-ce' into 'master'winh-before-frontend-testing-categories-docsAchilleas Pipinellis2018-11-135-64/+318
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document new report types See merge request gitlab-org/gitlab-ce!22828
| * | | | | | | | Document new report typesOlivier Gonzalez2018-11-135-64/+318
|/ / / / / / / /
* | | | | | | | Merge branch 'qa-auto-assign-codeowner-spec' into 'master'Grzegorz Bizon2018-11-133-4/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Update merge request page object and selectors See merge request gitlab-org/gitlab-ce!22939
| * | | | | | | Update merge request page object and selectorsqa-auto-assign-codeowner-specMark Lapierre2018-11-093-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are changes from EE that are also relevant to CE from: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8372
* | | | | | | | Merge branch 'docs-eks-updates' into 'master'Achilleas Pipinellis2018-11-132-23/+94
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update eks guide to include admin token creation. See merge request gitlab-org/gitlab-ce!22926
| * | | | | | | | Update eks guide to include admin token creation.Daniel Gruesso2018-11-132-23/+94
|/ / / / / / / /
* | | | | | | | Merge branch 'refactor-reference-regexes-and-identity-scopes' into 'master'Robert Speicher2018-11-135-17/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Refactor reference regexes and identity scopes See merge request gitlab-org/gitlab-ce!22987
| * | | | | | | Move Identity.uniqueness_scope to a modulerefactor-reference-regexes-and-identity-scopesYorick Peterse2018-11-122-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving this method to a separate module looks a bit odd, but it allows for EE to extend the method without also having to redefine a variety of validation rules.
| * | | | | | | Turn reference regex constants into methodsYorick Peterse2018-11-123-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Mentionable::ReferenceRegexes` used to define the following two constants: 1. DEFAULT_PATTERN 2. EXTERNAL_PATTERN These two constants were built using some of the class methods that reside in this same module. In EE we redefine one of these methods by using `prepend` at the start of the `ReferenceRegexes` module. This poses a problem: we can not move the `prepend` to the end of the file, because the constants later on depend on it. To resolve this problem, this commit turns these constants into class methods that memoize their results. This allows EE to redefine the appropriate methods before these two class methods are used, in turn allowing us to move the `prepend` to the end of the file. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8198 for more information.
* | | | | | | | Merge branch 'docs/fix-ordered-list-item-prefix' into 'master'Achilleas Pipinellis2018-11-1356-356/+361
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve Markdown ordered lists not conforming to styleguide See merge request gitlab-org/gitlab-ce!23007
| * | | | | | | | Resolve Markdown ordered lists not conforming to styleguidedocs/fix-ordered-list-item-prefixEvan Read2018-11-1356-356/+361
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'archive-builds-documentation' into 'master'Achilleas Pipinellis2018-11-132-5/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for archive builds Closes #53534 See merge request gitlab-org/gitlab-ce!22909
| * | | | | | | | Update docsarchive-builds-documentationKamil Trzciński2018-11-132-16/+16
| | | | | | | | |
| * | | | | | | | Add documentation for archive buildsKamil Trzciński2018-11-092-5/+21
| | | | | | | | |
* | | | | | | | | Merge branch 'kubernetes-http-response-code' into 'master'Kamil Trzciński2018-11-1314-42/+68
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show HTTP response code for Kubernetes errors Closes #53628 See merge request gitlab-org/gitlab-ce!22964
| * | | | | | | | | Show HTTP response code for Kubernetes errorsThong Kuah2018-11-1314-42/+68
|/ / / / / / / / /
* | | | | | | | | Merge branch 'leipert-upgrade-node-yarn' into 'master'Tim Zallmann2018-11-132-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to node v10.x and yarn 1.12.x See merge request gitlab-org/gitlab-ce!22979
| * | | | | | | | Upgrade to node v10.xleipert-upgrade-node-yarnLukas Eipert2018-11-122-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'remove-mr-version-controls-form-fixed-width-container' into ↵Phil Hughes2018-11-131-6/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' remove .mr-version-controls from .fixed-with-container See merge request gitlab-org/gitlab-ce!23003
| * | | | | | | | | remove .mr-version-controls from .fixed-with-containerOren Aksakal2018-11-121-6/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'docs-fl-define-vuejs-expert-role' into 'master'Tim Zallmann2018-11-131-0/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defines Vue.js Expert Role See merge request gitlab-org/gitlab-ce!21922
| * | | | | | | | | Updates wordingdocs-fl-define-vuejs-expert-roleFilipa Lacerda2018-09-261-3/+3
| | | | | | | | | |
| * | | | | | | | | Defines Vue.js Expert RoleFilipa Lacerda2018-09-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we have a vue.js expert role that is not defined By defining this role we can improve our Vue and Vuex code.
View Lorry Controller Status