summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Apply review commentsdocs/fix-mysql-docs-linksEvan Read2018-11-081-4/+5
|
* Fix broken links and other minor improvementsEvan Read2018-11-071-20/+25
|
* Merge branch 'rails5-mysql-milliseconds-deployment-spec' into 'master'Douglas Barbosa Alexandre2018-11-062-3/+8
|\ | | | | | | | | Rails5: fix mysql milliseconds issue in deployment model specs See merge request gitlab-org/gitlab-ce!22850
| * Rails5: fix mysql milliseconds issue in deployment model specsJasper Maes2018-11-062-3/+8
|/
* Merge branch 'docs/aws-install' into 'master'Achilleas Pipinellis2018-11-0616-3/+658
|\ | | | | | | | | | | | | Add AWS installation docs Closes #49501 See merge request gitlab-org/gitlab-ce!20778
| * Incorporate review changesdocs/aws-installAchilleas Pipinellis2018-11-063-53/+69
| |
| * edits per my reviewMike Lewis2018-11-061-52/+52
| |
| * Add section about GitalyAchilleas Pipinellis2018-11-051-0/+8
| |
| * Add GitLab Runners sectionAchilleas Pipinellis2018-11-051-0/+8
| |
| * Refactor guide and streamline stepsAchilleas Pipinellis2018-11-059-173/+140
| |
| * Add notes on ElastiCacheAchilleas Pipinellis2018-11-053-37/+74
| |
| * DatabaseAchilleas Pipinellis2018-11-052-36/+48
| |
| * Merge content from university AWS docsAchilleas Pipinellis2018-11-054-40/+266
| | | | | | | | https://docs.gitlab.com/ee/university/high-availability/aws
| * Move architecture section to the topAchilleas Pipinellis2018-11-051-6/+6
| |
| * Mention LFS S3 supportAchilleas Pipinellis2018-11-051-0/+5
| |
| * Clearer info on backup/restoreAchilleas Pipinellis2018-11-051-12/+35
| |
| * Add AWS installation docsAchilleas Pipinellis2018-11-0519-3/+356
| |
* | Merge branch 'bw-serializer-tech-debit' into 'master'Douwe Maan2018-11-0611-32/+153
|\ \ | | | | | | | | | | | | Extract code into IssueBoardEntity / serializer See merge request gitlab-org/gitlab-ce!22760
| * | Extract code into IssueBoardEntityBrett Walker2018-11-0612-34/+155
| | |
* | | Merge branch '53535-sticky-archived' into 'master'Phil Hughes2018-11-066-6/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Renders a warning block for archived job Closes #53535 See merge request gitlab-org/gitlab-ce!22811
| * | | Polyfills sticky position within a watcher53535-sticky-archivedFilipa Lacerda2018-11-061-11/+8
| | | |
| * | | [ci skip] Renders a warning block for archieved jobFilipa Lacerda2018-11-056-3/+90
| | |/ | |/| | | | | | | | | | When the job is archieved we render a affixed warning on the top of the job log
* | | Merge branch 'allow_single_letter_external_issue_ids' into 'master'Douglas Barbosa Alexandre2018-11-063-7/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow single letter external issue IDs Closes #52803 See merge request gitlab-org/gitlab-ce!22717
| * | | Add specs for single-letter external tracker refsSean McGivern2018-11-061-5/+23
| | | |
| * | | Adding changelog entryDídac Rodríguez Arbonès2018-11-011-0/+5
| | | |
| * | | Allow single letter external issue IDsDídac Rodríguez Arbonès2018-11-011-2/+2
| | | |
* | | | Merge branch 'unindirect-fetch-remote' into 'master'Rémy Coutable2018-11-066-145/+98
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Stop Repository#fetch_remote from using Gitlab::Shell See merge request gitlab-org/gitlab-ce!22635
| * | | | Stop Repository#fetch_remote from using Gitlab::ShellNick Thomas2018-11-066-145/+98
| | | | | | | | | | | | | | | | | | | | This indirection doesn't provide any value, so remove it
* | | | | Merge branch 'ce-jej/group-saml-sso-badges' into 'master'Robert Speicher2018-11-063-6/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE MR for Group SAML SSO badges See merge request gitlab-org/gitlab-ce!22587
| * | | | | Add MembersPreloader to fix ActiveRecord copce-jej/group-saml-sso-badgesJames Edwards-Jones2018-11-022-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MembersPresentation was previously preloading records and we wanted to extend this in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5807 By moving this to MembersPreloader we avoid introducing a new cop exception that would otherwise have been needed in EE::MembersPresentation
| * | | | | EE render_if_exists for SSO badge in _member viewJames Edwards-Jones2018-10-241-0/+2
| | | | | |
* | | | | | Merge branch 'ccr/51052_keep_labels_on_issue' into 'master'Robert Speicher2018-11-064-5/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed label removal from issue Closes #51052 See merge request gitlab-org/gitlab-ce!22762
| * | | | | | Fixed label removal from issueccr/51052_keep_labels_on_issueChantal Rollison2018-11-054-5/+8
| | | | | | |
* | | | | | | Merge branch '25140-disable-stop-button' into 'master'Phil Hughes2018-11-065-9/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable stop environment button while deployment is running See merge request gitlab-org/gitlab-ce!22805
| * | | | | | | Disable stop environment button while deployment is runningFilipa Lacerda2018-11-065-9/+40
|/ / / / / / /
* | | | | | | Merge branch 'rake-gitaly-check' into 'master'Rémy Coutable2018-11-063-118/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delegate storage health check to Gitaly's health check Closes gitaly#1336 See merge request gitlab-org/gitlab-ce!22063
| * | | | | | | Add gitlab:gitaly:check task for Gitaly health checkrake-gitaly-checkAlejandro Rodríguez2018-10-233-118/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, since Gitaly now takes care of checking for storage paths existence/accessibility, we can remove those check from the gitlab:gitlab_shell_check task and advance further into 0 direct disk approach on gitlab-rails
* | | | | | | | Merge branch 'dz-add-packages-to-yml' into 'master'Marin Jankovski2018-11-061-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add packages section to CE config file See merge request gitlab-org/gitlab-ce!22151
| * | | | | | | | Add packages section to CE config filedz-add-packages-to-ymlDmitriy Zaporozhets2018-10-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch '49403-redesign-activity-feed' into 'master'Annabel Dunstone Gray2018-11-0620-107/+146
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Redesign activity feed" Closes #49403 See merge request gitlab-org/gitlab-ce!22217
| * | | | | | | | | Resolve "Redesign activity feed"Martin Wortschack2018-11-0620-107/+146
|/ / / / / / / / /
* | | | | | | | | Merge branch 'restore-resource-user-via-browser-qa' into 'master'Douglas Barbosa Alexandre2018-11-061-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore changes from: See merge request gitlab-org/gitlab-ce!22838
| * | | | | | | | | Restore changes from:restore-resource-user-via-browser-qaLin Jen-Shin2018-11-061-1/+1
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 190afc62fb1e8753b2339d1d052b19a5da369c9e It was lost during a conflict resolution
* | | | | | | | | Merge branch 'support-project-security-dashboard' into 'master'Grzegorz Bizon2018-11-062-5/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport support project security dashboard changes See merge request gitlab-org/gitlab-ce!22824
| * | | | | | | | | Backport support project security dashboard changessupport-project-security-dashboardKamil Trzciński2018-11-062-5/+19
| | | | | | | | | |
* | | | | | | | | | Merge branch 'stateful_deployments' into 'master'Kamil Trzciński2018-11-0655-579/+1265
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change life cycle of `deployments` records in order to make it a stateful object See merge request gitlab-org/gitlab-ce!22380
| * | | | | | | | | | Prevent nil exception in environment statusstateful_deploymentsShinya Maeda2018-11-061-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix flaky specShinya Maeda2018-11-061-5/+6
| | | | | | | | | | |
| * | | | | | | | | | Fix specShinya Maeda2018-11-062-16/+1
| | | | | | | | | | |
| * | | | | | | | | | Use fire_state_eventShinya Maeda2018-11-061-1/+1
| | | | | | | | | | |