summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WIP48098-add-mutual-tls-to-tiller-for-gitlab-managed-appsDylan Griffith2018-07-2018-87/+80
|
* Merge branch 'regen-2fa-codes' into 'master'Douwe Maan2018-07-192-1/+12
|\ | | | | | | | | | | | | Add button to regenerate 2FA codes. Closes #48408 See merge request gitlab-org/gitlab-ce!20295
| * Add button to regenerate 2FA codes.Luke Picciau2018-07-192-1/+12
|/
* Merge branch 'accept-rf3-2822-compliant-addresses' into 'master'repo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-even-moreSean McGivern2018-07-194-14/+62
|\ | | | | | | | | | | | | Improve email address parsing Closes #44676 See merge request gitlab-org/gitlab-ce!18192
| * Improve email address parsingGeorge Thomas2018-07-194-14/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you enter the following RFC 2822 compliant address: `John Doe <john@doe.com>` Gitlab will attempt to send three emails: 1) John 2) Doe 3) john@doe.com With this change given the following: `John Doe <johndoe@example.com>` `Jane Doe <janedoe@example.com>` Gitlab will send emails to `johndoe@example.com` and `janedoe@example.com`
* | Merge branch 'gitaly-remote-branches' into 'master'Douwe Maan2018-07-199-95/+73
|\ \ | | | | | | | | | | | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPC See merge request gitlab-org/gitlab-ce!20701
| * | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branchesAlejandro Rodríguez2018-07-189-95/+73
| | |
* | | Merge branch 'sh-limit-unauthenticated-session-times' into 'master'Robert Speicher2018-07-184-0/+51
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Limit the TTL for anonymous sessions to 1 hour Closes #48101 See merge request gitlab-org/gitlab-ce!20700
| * | Limit the TTL for anonymous sessions to 1 hourStan Hu2018-07-184-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, all sessions are given the same expiration time configured in the session store (e.g. 1 week). However, unauthenticated users can generate a lot of sessions, primarily for CSRF verification. It makes sense to reduce the TTL for unauthenticated to something much lower than the default (e.g. 1 hour) to limit Redis memory. In addition, Rails creates a new session after login, so the short TTL doesn't even need to be extended. Closes #48101
* | | Merge branch 'leipert-proper-icon-validator' into 'master'Mike Greiling2018-07-1822-61/+123
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Proper icon validator Closes #49236 See merge request gitlab-org/gitlab-ce!20620
| * | | Proper icon validatorLukas Eipert2018-07-1822-61/+123
|/ / /
* | | Merge branch 'toggle-password-cluster' into 'master'Annabel Gray2018-07-184-1/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Toggle Show / Hide Button for Kubernetes Password Closes #49193 See merge request gitlab-org/gitlab-ce!20659
| * | | Toggle Show / Hide Button for Kubernetes Passwordgfyoung2018-07-184-1/+27
| | | | | | | | | | | | | | | | Closes #49193.
* | | | Merge branch '41784-monitoring-graph-popovers' into 'master'Clement Ho2018-07-183-8/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix arrow for popovers on monitoring graph" Closes #41784 See merge request gitlab-org/gitlab-ce!20655
| * | | | Resolve "Fix arrow for popovers on monitoring graph"Annabel Gray2018-07-183-8/+40
|/ / / /
* | | | Merge branch '_acet-fix-expanding-context-lines' into 'master'Tim Zallmann2018-07-184-4/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix rendering context lines on MR diffs Closes #49242 and #49343 See merge request gitlab-org/gitlab-ce!20642
| * | | Add CHANGELOG._acet-fix-expanding-context-linesFatih Acet2018-07-171-0/+5
| | | |
| * | | Remove v-once from diff lines components.Fatih Acet2018-07-173-4/+0
| | | |
* | | | Merge branch '49324-add-support-for-tar-gz-autodevops-charts' into 'master'Kamil Trzciński2018-07-182-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add support for tar.gz AUTO_DEVOPS_CHART charts" Closes #49324 See merge request gitlab-org/gitlab-ce!20691
| * | | | Add support for tar.gz AUTO_DEVOPS_CHART charts (#49324)Dylan Griffith2018-07-182-0/+6
| | | | |
* | | | | Merge branch '_acet-fix-mr-autosave' into 'master'Tim Zallmann2018-07-1810-50/+106
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix autosave issues for MR discussions Closes #48876 and #48877 See merge request gitlab-org/gitlab-ce!20569
| * | | | | i18n changes on gitlab.pot.Fatih Acet2018-07-181-0/+3
| | | | | |
| * | | | | Revert debounce.Fatih Acet2018-07-182-25/+3
| | | | | |
| * | | | | Fix resetting autosave value after cancel.Fatih Acet2018-07-181-1/+1
| | | | | |
| * | | | | i18n changes for note cancel confirmations.Fatih Acet2018-07-182-2/+7
| | | | | |
| * | | | | Add disposeAutoSave method autosave mixin.Fatih Acet2018-07-182-1/+4
| | | | | |
| * | | | | Debounce Autosave callback.Fatih Acet2018-07-182-10/+28
| | | | | |
| * | | | | Add CHANGELOG.Fatih Acet2018-07-181-0/+5
| | | | | |
| * | | | | Fix failing specs :fingers-crossed:Fatih Acet2018-07-183-14/+46
| | | | | |
| * | | | | Fix autosave in noteable discussion.Fatih Acet2018-07-182-18/+16
| | | | | |
| * | | | | Fix isDirty check of noteable discussion.Fatih Acet2018-07-181-3/+3
| | | | | |
| * | | | | Add extra key support to autosave mixin.Fatih Acet2018-07-181-4/+10
| | | | | |
| * | | | | Add confirmation modal before cancelling the comment form in diff line note ↵Fatih Acet2018-07-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | form.
| * | | | | Use built-in autosave mixin in diff line note form.Fatih Acet2018-07-181-7/+5
| | | | | |
| * | | | | Add dispose method to autosave mixin.Fatih Acet2018-07-181-0/+4
| | | | | |
| * | | | | Update note form component name.Fatih Acet2018-07-181-1/+1
| | | | | |
* | | | | | Merge branch ↵Sean McGivern2018-07-1811-14/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49369-failure-in-qa-specs-features-ee-geo-attachment_replication_spec-rb' into 'master' Resolve "Failure in qa/specs/features/ee/geo/attachment_replication_spec.rb" Closes #49369 See merge request gitlab-org/gitlab-ce!20692
| * | | | | | Disambiguate 'File' under qa/ since we have a QA::Factory::Resource::File ↵Rémy Coutable2018-07-1811-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class as well Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'docs-update-chart-docs' into 'master'Marin Jankovski2018-07-181-10/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Point to charts docs for beta limitations of the gitlab chart. See merge request gitlab-org/gitlab-ce!20690
| * | | | | | | Point to charts docs for beta limitations of the gitlab chart.Marin Jankovski2018-07-181-10/+2
| | | | | | | |
* | | | | | | | Merge branch 'jprovazn-fix-diff-note' into 'master'Sean McGivern2018-07-183-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix serialization of LegacyDiffNote Closes #49355 See merge request gitlab-org/gitlab-ce!20685
| * | | | | | | | Fix serialization of LegacyDiffNoteJan Provaznik2018-07-183-1/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'update-card-body-style' into 'master'Annabel Gray2018-07-185-11/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove background color from card-body style Closes #49350 See merge request gitlab-org/gitlab-ce!20689
| * | | | | | | | Remove background color from card-body styleGeorge Tsiolis2018-07-185-11/+15
| | | | | | | | |
* | | | | | | | | Merge branch 'jprovazn-fix-filename' into 'master'Kamil Trzciński2018-07-185-18/+86
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filename for accelerated uploads See merge request gitlab-org/gitlab-ce!20672
| * | | | | | | | | Fix filename for accelerated uploadsJan Provaznik2018-07-185-18/+86
|/ / / / / / / / /
* | | | | | | | | Merge branch 'zj-rev-list-removal' into 'master'Douwe Maan2018-07-186-105/+67
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove RevList class See merge request gitlab-org/gitlab-ce!20087
| * | | | | | | | | Client implementation for Repository#new_commitsZeger-Jan van de Weg2018-07-186-105/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After trying to remove the whole method in 8f69014af2902d8d53fe931268bec60f6858f160, this is a more gentle approach to the method. :) Prior to this change, new commit detection wasn't implemented in Gitaly, this was done through: https://gitlab.com/gitlab-org/gitaly/merge_requests/779 As the new implemented got moved around a bit, the whole RevList class got removed. Part of https://gitlab.com/gitlab-org/gitaly/issues/1233
* | | | | | | | | | Merge branch 'deploy_tokens_view_improvement' into 'master'Phil Hughes2018-07-182-8/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update _form.html.haml (deploy tokens) to improve display of scopes See merge request gitlab-org/gitlab-ce!20578
| * | | | | | | | | Update _form.html.haml (deploy tokens) to improve display of scopesMarcel Amirault2018-07-182-8/+13
|/ / / / / / / / /
View Lorry Controller Status