summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Feature backported to CE in 11.5, not 10.7docs/fix-version-number-ce-docEvan Read2018-11-081-1/+1
|
* Merge branch 'docs/add-warning-for-registry-configuration' into 'master'Evan Read2018-11-071-1/+4
|\ | | | | | | | | Emphasis the importance of auth registry See merge request gitlab-org/gitlab-ce!22843
| * Emphasis the importance of auth registrydocs/add-warning-for-registry-configurationSteve Azzopardi2018-11-071-1/+4
| | | | | | | | | | | | | | | | The container registry requires the `auth` config to be set up properly or users will be able to download images that they are not authorized to do so. For example https://gitlab.com/gitlab-org/gitlab-runner/issues/3652
* | Merge branch 'fix-stuck-import-jobs-query-performance-issue' into 'master'Douwe Maan2018-11-074-35/+51
|\ \ | | | | | | | | | | | | StuckImportJobsWorker query performance optimization See merge request gitlab-org/gitlab-ce!22879
| * | StuckImportJobsWorker query performance optimizationTiago Botelho2018-11-074-35/+51
| | | | | | | | | | | | | | | | | | Improves the performance of fetching the enqueued projects for StuckImportJobsWorker, preventing a statement timeout.
* | | Merge branch 'button-icon' into 'master'Tim Zallmann2018-11-071-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Adds a btn-icon class See merge request gitlab-org/gitlab-ce!22870
| * | | Adds a btn-icon classbutton-iconsamdbeckham2018-11-071-0/+4
| | | |
* | | | Merge branch 'gt-align-sign-in-button' into 'master'Mike Greiling2018-11-072-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align sign in button Closes #53673 See merge request gitlab-org/gitlab-ce!22888
| * | | | Align sign in buttonGeorge Tsiolis2018-11-072-1/+6
| | | | |
* | | | | Merge branch 'prevent-override-of-attr_encrypted' into 'master'Stan Hu2018-11-071-5/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent attr_encrypted models from being overriden Closes gitlab-ee#8234 See merge request gitlab-org/gitlab-ce!22764
| * | | | | Prevent attr_encrypted models from being overridenStan Hu2018-11-071-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing spec in spec/controllers/admin/hooks_controller_spec.rb attr_encrypted expects models to have their attribute methods defined, or it will override them with standard Ruby accessors. Migration specs that rolled back the state of the database after columns were migrated to encrypted values were interfering with these definitions. To ensure that the SystemHook specs pass, we need to call `SystemHook.define_attribute_methods` to ensure that attr_encrypted sees the right methods that reflect the latest state of the database. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8234
* | | | | | Merge branch 'sh-paginate-bitbucket-server-imports' into 'master'Douglas Barbosa Alexandre2018-11-0710-20/+132
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paginate Bitbucket Server importer projects See merge request gitlab-org/gitlab-ce!22825
| * | | | | | Paginate Bitbucket Server importer projectsStan Hu2018-11-0710-20/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent delays in loading the page and reduce memory usage, limit the number of projects shown at 25 per page. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/50021
* | | | | | | Merge branch 'danger-mr-title-warning' into 'master'Robert Speicher2018-11-071-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn when MR titles are too long. See merge request gitlab-org/gitlab-ce!22845
| * | | | | | | Warn when MR titles are too longdanger-mr-title-warningYorick Peterse2018-11-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a Danger check to produce a warning for MR titles greater than 72 characters. This is necessary because when squash on merge is used, the MR title will be used for the commit message (at least by default). This in turn leads to commit messages that violate our commit message guidelines. For more information, refer to https://gitlab.com/gitlab-org/release/framework/issues/24.
* | | | | | | | Merge branch 'jira-ping-differentiate-cloud' into 'master'Sean McGivern2018-11-073-2/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping - Differentiate Jira Server and Cloud Closes #51043 See merge request gitlab-org/gitlab-ce!22791
| * | | | | | | | Usage ping - Differentiate Jira Server and Cloudjira-ping-differentiate-cloudMario de la Ossa2018-11-073-2/+34
| | | | | | | | |
* | | | | | | | | Merge branch 'ml-fix-create-merge-spec-qa' into 'master'Robert Speicher2018-11-071-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix e2e create merge request test Closes gitlab-org/quality/nightly#32 See merge request gitlab-org/gitlab-ce!22877
| * | | | | | | | | Fix e2e create merge request testml-fix-create-merge-spec-qaMark Lapierre2018-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QA selector to 'New label' button on empty labels page
* | | | | | | | | | Merge branch 'bvl-patches-via-mail' into 'master'Douwe Maan2018-11-0731-13/+1065
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to add patches to merge requests created via email Closes #40830 See merge request gitlab-org/gitlab-ce!22723
| * | | | | | | | | | Allow limiting quick actions to executeBob Van Landuyt2018-11-076-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes we don't want to trigger any quick actions that cause side effects. For example when building a record to validate. This allows listing the quick actions that need to be performed.
| * | | | | | | | | | Apply patches when creating MR via emailBob Van Landuyt2018-11-0726-4/+1022
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to add patches as attachments to merge request created via email. When an email to create a merge request is sent, all the attachments ending in `.patch` will be applied to the branch specified in the subject of the email. If the branch did not exist, it will be created from the HEAD of the repository. When the patches could not be applied, the error message will be replied to the user. The patches can have a maximum combined size of 2MB for now.
* | | | | | | | | | | Merge branch 'dz-fix-initialize-shards' into 'master'Dmitriy Zaporozhets2018-11-071-4/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix syntax error in initializers/fill_shards See merge request gitlab-org/gitlab-ce!22871
| * | | | | | | | | | | Fix syntax error in initializers/fill_shardsDmitriy Zaporozhets2018-11-071-4/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'issue_7478' into 'master'Fatih Acet2018-11-077-4/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport - Chart showing issues created per month See merge request gitlab-org/gitlab-ce!22793
| * | | | | | | | | | | CE backport - Chart showing issues created per monthConstance Okoghenun2018-11-077-4/+14
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '47008-issue-board-card-design' into 'master'Phil Hughes2018-11-0730-224/+628
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Issue board card design" Closes #47008 See merge request gitlab-org/gitlab-ce!21229
| * | | | | | | | | | | Resolve "Issue board card design"Constance Okoghenun2018-11-0730-224/+628
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'revert-45b61a9e' into 'master'Nick Thomas2018-11-0725-55/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'" See merge request gitlab-org/gitlab-ce!22875
| * | | | | | | | | | | Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into ↵Douwe Maan2018-11-0725-55/+47
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !22526
* | | | | | | | | | | Merge branch 'more-helm-install-error-logs' into 'master'Dmitriy Zaporozhets2018-11-072-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more logging for errors with kubernetes on helm install See merge request gitlab-org/gitlab-ce!22848
| * | | | | | | | | | | Add more logging for errors with kubernetes on helm installmore-helm-install-error-logsDylan Griffith2018-11-062-4/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-formatting-eks-docs' into 'master'Achilleas Pipinellis2018-11-071-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix EKS formatting See merge request gitlab-org/gitlab-ce!22781
| * | | | | | | | | | | | Fix EKS formattingfix-formatting-eks-docsJoshua Lambert2018-11-021-1/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs/refine-markdown-proselint-config' into 'master'Achilleas Pipinellis2018-11-073-98/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add refined sample linting configuration See merge request gitlab-org/gitlab-ce!22827
| * | | | | | | | | | | | | Add refined sample linting configurationdocs/refine-markdown-proselint-configEvan Read2018-11-063-98/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - Ensures documentation section adheres to linters. - Makes other minor improvements.
* | | | | | | | | | | | | | Merge branch '52767-more-chaos-for-gitlab' into 'master'Sean McGivern2018-11-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more chaos to GitLab Closes #53362 and #52767 See merge request gitlab-org/gitlab-ce!22746
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '52767-more-chaos-for-gitlab' into 'master'Sean McGivern2018-11-075-1/+187
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more chaos to GitLab Closes #53362 and #52767 See merge request gitlab-org/gitlab-ce!22746
| * | | | | | | | | | | | | | Documentation updates as per review [skip ci]52767-more-chaos-for-gitlabAndrew Newdigate2018-11-062-35/+68
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Updated with Sean's feedbackAndrew Newdigate2018-11-052-8/+23
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixing the broken build with style fixesAndrew Newdigate2018-11-013-9/+11
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add documentation, secure routes, etcAndrew Newdigate2018-11-014-4/+103
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Leak memory, spin cpu and kill the processAndrew Newdigate2018-11-012-0/+26
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adding chaos to GitLab through chaos endpointsAndrew Newdigate2018-11-012-0/+11
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'docs/update-installtion-guide-for-11-5' into 'master'Achilleas Pipinellis2018-11-072-24/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Installation Guide for 11.5 See merge request gitlab-org/gitlab-ce!22768
| * | | | | | | | | | | | | | | Update Installation Guide for 11.5Steve Azzopardi2018-11-072-24/+10
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '6500-fix-misaligned-approvers-dropdown' into 'master'Fatih Acet2018-11-073-12/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix misaligned approvers dropdown See merge request gitlab-org/gitlab-ce!22832
| * | | | | | | | | | | | | | | Fix miss-aligned approvers dropdown6500-fix-misaligned-approvers-dropdownjerasmus2018-11-073-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the miss-alignment by adding the correct classes. Cleaned up the method to rather use string interpolation.
* | | | | | | | | | | | | | | | Merge branch 'docs-private-vs-personal-access-tokens' into 'master'Achilleas Pipinellis2018-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix private access token -> personal access token See merge request gitlab-org/gitlab-ce!22867
| * | | | | | | | | | | | | | | Fix private access token -> personal access tokendocs-private-vs-personal-access-tokensDavid Planella2018-11-071-1/+1
| | | | | | | | | | | | | | | |