Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Apply review commentsdocs/fix-mysql-docs-links | Evan Read | 2018-11-08 | 1 | -4/+5 |
| | |||||
* | Fix broken links and other minor improvements | Evan Read | 2018-11-07 | 1 | -20/+25 |
| | |||||
* | Merge branch 'rails5-mysql-milliseconds-deployment-spec' into 'master' | Douglas Barbosa Alexandre | 2018-11-06 | 2 | -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 specs | Jasper Maes | 2018-11-06 | 2 | -3/+8 |
|/ | |||||
* | Merge branch 'docs/aws-install' into 'master' | Achilleas Pipinellis | 2018-11-06 | 16 | -3/+658 |
|\ | | | | | | | | | | | | | Add AWS installation docs Closes #49501 See merge request gitlab-org/gitlab-ce!20778 | ||||
| * | Incorporate review changesdocs/aws-install | Achilleas Pipinellis | 2018-11-06 | 3 | -53/+69 |
| | | |||||
| * | edits per my review | Mike Lewis | 2018-11-06 | 1 | -52/+52 |
| | | |||||
| * | Add section about Gitaly | Achilleas Pipinellis | 2018-11-05 | 1 | -0/+8 |
| | | |||||
| * | Add GitLab Runners section | Achilleas Pipinellis | 2018-11-05 | 1 | -0/+8 |
| | | |||||
| * | Refactor guide and streamline steps | Achilleas Pipinellis | 2018-11-05 | 9 | -173/+140 |
| | | |||||
| * | Add notes on ElastiCache | Achilleas Pipinellis | 2018-11-05 | 3 | -37/+74 |
| | | |||||
| * | Database | Achilleas Pipinellis | 2018-11-05 | 2 | -36/+48 |
| | | |||||
| * | Merge content from university AWS docs | Achilleas Pipinellis | 2018-11-05 | 4 | -40/+266 |
| | | | | | | | | https://docs.gitlab.com/ee/university/high-availability/aws | ||||
| * | Move architecture section to the top | Achilleas Pipinellis | 2018-11-05 | 1 | -6/+6 |
| | | |||||
| * | Mention LFS S3 support | Achilleas Pipinellis | 2018-11-05 | 1 | -0/+5 |
| | | |||||
| * | Clearer info on backup/restore | Achilleas Pipinellis | 2018-11-05 | 1 | -12/+35 |
| | | |||||
| * | Add AWS installation docs | Achilleas Pipinellis | 2018-11-05 | 19 | -3/+356 |
| | | |||||
* | | Merge branch 'bw-serializer-tech-debit' into 'master' | Douwe Maan | 2018-11-06 | 11 | -32/+153 |
|\ \ | | | | | | | | | | | | | Extract code into IssueBoardEntity / serializer See merge request gitlab-org/gitlab-ce!22760 | ||||
| * | | Extract code into IssueBoardEntity | Brett Walker | 2018-11-06 | 12 | -34/+155 |
| | | | |||||
* | | | Merge branch '53535-sticky-archived' into 'master' | Phil Hughes | 2018-11-06 | 6 | -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-archived | Filipa Lacerda | 2018-11-06 | 1 | -11/+8 |
| | | | | |||||
| * | | | [ci skip] Renders a warning block for archieved job | Filipa Lacerda | 2018-11-05 | 6 | -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 Alexandre | 2018-11-06 | 3 | -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 refs | Sean McGivern | 2018-11-06 | 1 | -5/+23 |
| | | | | |||||
| * | | | Adding changelog entry | Dídac Rodríguez Arbonès | 2018-11-01 | 1 | -0/+5 |
| | | | | |||||
| * | | | Allow single letter external issue IDs | Dídac Rodríguez Arbonès | 2018-11-01 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'unindirect-fetch-remote' into 'master' | Rémy Coutable | 2018-11-06 | 6 | -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::Shell | Nick Thomas | 2018-11-06 | 6 | -145/+98 |
| | | | | | | | | | | | | | | | | | | | | This indirection doesn't provide any value, so remove it | ||||
* | | | | | Merge branch 'ce-jej/group-saml-sso-badges' into 'master' | Robert Speicher | 2018-11-06 | 3 | -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-badges | James Edwards-Jones | 2018-11-02 | 2 | -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 view | James Edwards-Jones | 2018-10-24 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'ccr/51052_keep_labels_on_issue' into 'master' | Robert Speicher | 2018-11-06 | 4 | -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_issue | Chantal Rollison | 2018-11-05 | 4 | -5/+8 |
| | | | | | | | |||||
* | | | | | | | Merge branch '25140-disable-stop-button' into 'master' | Phil Hughes | 2018-11-06 | 5 | -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 running | Filipa Lacerda | 2018-11-06 | 5 | -9/+40 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'rake-gitaly-check' into 'master' | Rémy Coutable | 2018-11-06 | 3 | -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-check | Alejandro Rodríguez | 2018-10-23 | 3 | -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 Jankovski | 2018-11-06 | 1 | -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-yml | Dmitriy Zaporozhets | 2018-10-05 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | | | Merge branch '49403-redesign-activity-feed' into 'master' | Annabel Dunstone Gray | 2018-11-06 | 20 | -107/+146 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Redesign activity feed" Closes #49403 See merge request gitlab-org/gitlab-ce!22217 | ||||
| * | | | | | | | | | Resolve "Redesign activity feed" | Martin Wortschack | 2018-11-06 | 20 | -107/+146 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'restore-resource-user-via-browser-qa' into 'master' | Douglas Barbosa Alexandre | 2018-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore changes from: See merge request gitlab-org/gitlab-ce!22838 | ||||
| * | | | | | | | | | Restore changes from:restore-resource-user-via-browser-qa | Lin Jen-Shin | 2018-11-06 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 190afc62fb1e8753b2339d1d052b19a5da369c9e It was lost during a conflict resolution | ||||
* | | | | | | | | | Merge branch 'support-project-security-dashboard' into 'master' | Grzegorz Bizon | 2018-11-06 | 2 | -5/+19 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport support project security dashboard changes See merge request gitlab-org/gitlab-ce!22824 | ||||
| * | | | | | | | | | Backport support project security dashboard changessupport-project-security-dashboard | Kamil Trzciński | 2018-11-06 | 2 | -5/+19 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'stateful_deployments' into 'master' | Kamil Trzciński | 2018-11-06 | 55 | -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_deployments | Shinya Maeda | 2018-11-06 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix flaky spec | Shinya Maeda | 2018-11-06 | 1 | -5/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix spec | Shinya Maeda | 2018-11-06 | 2 | -16/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Use fire_state_event | Shinya Maeda | 2018-11-06 | 1 | -1/+1 |
| | | | | | | | | | | |