| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Copyedit embedding snippets docsadd-embedded-snippets-docs | Achilleas Pipinellis | 2018-05-24 | 2 | -7/+20 |
| | | |||||
| * | Fix broken image reference | Andreas Kämmerle | 2018-05-23 | 1 | -1/+1 |
| | | |||||
| * | Init documentation for embedded snippets | Andreas Kämmerle | 2018-05-23 | 2 | -0/+18 |
| | | |||||
| * | Merge branch '39710-search-placeholder-cut-off' into 'master' | Annabel Gray | 2018-05-23 | 7 | -29/+16 |
| |\ | | | | | | | | | | | | | Resolve "Runners search input placeholder is cut off" Closes #39710 See merge request gitlab-org/gitlab-ce!19015 | ||||
| | * | Fixes: Runners search input placeholder is cut off | Jacopo | 2018-05-23 | 7 | -29/+16 |
| | | | |||||
| * | | Merge branch 'ldap-u2f-fix' into 'master' | Mike Greiling | 2018-05-23 | 2 | -0/+8 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fixed U2F authentication when used with LDAP Closes #46661 See merge request gitlab-org/gitlab-ce!19115 | ||||
| | * | | Fixed U2F authentication when used with LDAP | Phil Hughes | 2018-05-23 | 2 | -0/+8 |
| | | | | | | | | | | | | | Closes #46661 | ||||
| * | | | Merge branch ↵ | Douwe Maan | 2018-05-23 | 15 | -181/+295 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master' Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`" Closes #45175 See merge request gitlab-org/gitlab-ce!18754 | ||||
| | * | | | Don't expire the current ApplicationSetting in config/initializers/1_settings.rb | Rémy Coutable | 2018-05-23 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes | Rémy Coutable | 2018-05-23 | 2 | -76/+69 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | Use ApplicationSetting.current_without_cache instead of ↵ | Rémy Coutable | 2018-05-23 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ApplicationSetting.current where applicable Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | Use the new CacheableAttributes concern in the ApplicationSetting and ↵ | Rémy Coutable | 2018-05-23 | 5 | -98/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Appearance models Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | Introduce a new CacheableAttributes concern | Rémy Coutable | 2018-05-23 | 3 | -0/+211 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Merge branch 'akaemmerle-update-keyboard-shortcuts-doc' into 'master' | Achilleas Pipinellis | 2018-05-23 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update keyboard shortcut conventions See merge request gitlab-org/gitlab-ce!19014 | ||||
| | * | | | | Update keyboard shortcut conventions | Andreas Kämmerle | 2018-05-23 | 1 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge branch 'fix/devops-remove-beta' into 'master' | Tim Zallmann | 2018-05-23 | 8 | -9/+10 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | removed "(Beta)" from "Auto DevOps" messages See merge request gitlab-org/gitlab-ce!18759 | ||||
| | * | | | | removed "(Beta)" from "Auto DevOps" messagesfix/devops-remove-beta | Paul Slaughter | 2018-05-21 | 8 | -9/+10 |
| | | | | | | |||||
| * | | | | | Merge branch '46505-update-autodevops-docs' into 'master' | Achilleas Pipinellis | 2018-05-23 | 1 | -0/+24 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation of variables usage for disabling/enabling jobs in Auto DevOps Closes #46505 See merge request gitlab-org/gitlab-ce!19076 | ||||
| | * | | | | | Add documentation of variables usage for disabling/enabling jobs in Auto DevOps | Tomasz Maczukin | 2018-05-23 | 1 | -0/+24 |
| |/ / / / / | |||||
| * | | | | | Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master' | Rémy Coutable | 2018-05-23 | 2 | -1/+17 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Prometheus integration fails on k8s 1.10" Closes #46259 See merge request gitlab-org/gitlab-ce!19082 | ||||
| | * | | | | Fix rubocop46259-prometheus-integration-fails-on-kube-1-10 | Tiago Botelho | 2018-05-23 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Update Prometheus URL spec for 1.10 format | Joshua Lambert | 2018-05-22 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Monkey patches Kubeclient::Client#proxy_url in order to make it compliant ↵ | Tiago Botelho | 2018-05-22 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | with version 1.10 of kubernetes API | ||||
| * | | | | | Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master' | Douwe Maan | 2018-05-23 | 2 | -0/+20 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrading from EE to CE fails on project_mirror_data migrations Closes #46630 See merge request gitlab-org/gitlab-ce!19109 | ||||
| | * | | | | | Rollback changes made to CreateProjectMirrorData46630-add-missing-columns-to-project-mirror-data | Tiago Botelho | 2018-05-23 | 1 | -11/+7 |
| | | | | | | | |||||
| | * | | | | | Renames AddMissingColumnsToProjectMirrorData to ↵ | Tiago Botelho | 2018-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | EnsureMissingColumnsToProjectMirrorData | ||||
| | * | | | | | Adds changelog | Tiago Botelho | 2018-05-23 | 1 | -0/+5 |
| | | | | | | | |||||
| | * | | | | | Adds migration to ensure the new project_mirror_data columns are indeed ↵ | Tiago Botelho | 2018-05-23 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | added to the table | ||||
| | * | | | | | Edits create_project_mirror_data to add the new columns when table already ↵ | Tiago Botelho | 2018-05-23 | 1 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | exists | ||||
| * | | | | | | Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master' | Rémy Coutable | 2018-05-23 | 3 | -26/+54 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render 404 when prometheus adapter is disabled in Prometheus metrics controller Closes #46413 See merge request gitlab-org/gitlab-ce!19110 | ||||
| | * | | | | | Render 404 when prometheus adapter is disabled in Prometheus metrics controller | Tiago Botelho | 2018-05-23 | 3 | -26/+54 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'ce_backport_issue_5128' into 'master' | Rémy Coutable | 2018-05-23 | 2 | -6/+14 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | CE backport - Allow viewing only one board when multiple issue boards is not enabled See merge request gitlab-org/gitlab-ce!19068 | ||||
| | * | | | | | CE backport - Allow viewing only one board when multiple issue boards is not ↵ce_backport_issue_5128 | Felipe Artur | 2018-05-22 | 2 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | enabled | ||||
| * | | | | | | Merge branch 'ce-5949-render_optional' into 'master' | Rémy Coutable | 2018-05-23 | 3 | -2/+50 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Use render_if_exists to hide EE specific codes See merge request gitlab-org/gitlab-ce!19041 | ||||
| | * | | | | | | CE: Use render_if_exists to hide EE specific codes | Lin Jen-Shin | 2018-05-23 | 3 | -2/+50 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'rs-boards-issues-create-service-parity' into 'master' | Rémy Coutable | 2018-05-23 | 1 | -1/+5 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | Bring CE-EE parity to app/services/boards/issues/create_service.rb See merge request gitlab-org/gitlab-ce!19093 | ||||
| | * | | | | | Bring CE-EE parity to app/services/boards/issues/create_service.rbrs-boards-issues-create-service-parity | Robert Speicher | 2018-05-22 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'use-git-depth-1-on-cng-trigger' into 'master' | Rémy Coutable | 2018-05-23 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set GIT_DEPTH to 1 to speed up cloning for the cloud images trigger See merge request gitlab-org/gitlab-ce!19098 | ||||
| | * | | | | | | Set GIT_DEPTH to 1 to speed up cloning for the cloud images triggeruse-git-depth-1-on-cng-trigger | DJ Mountney | 2018-05-22 | 1 | -0/+2 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'issue-25256' into 'master' | Douwe Maan | 2018-05-23 | 7 | -7/+72 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip email trim when email is creating new issue See merge request gitlab-org/gitlab-ce!18865 | ||||
| | * | | | | | | skip email trim when email is creating new issue | Cameron Crockett | 2018-05-22 | 7 | -7/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates from MR discussion 1. Added test for ReplyParser 2. Changed param to trim_reply with default set as true Removed keyword param in favor of normal options param updates for MR discussion Resolutions for code review comments more code review fixes | ||||
| * | | | | | | | Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Repo#squash_in_progress Opt-Out See merge request gitlab-org/gitlab-ce!19088 | ||||
| | * | | | | | | | Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Wiki::GetFormattedData to OptOut See merge request gitlab-org/gitlab-ce!19091 | ||||
| | * | | | | | | | | Move Wiki::GetFormattedData to OptOutgitaly-wiki-get-formatted-data-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'gitaly-import-project-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move ImportProject to OptOut in Gitaly See merge request gitlab-org/gitlab-ce!19090 | ||||
| | * | | | | | | | | | Move ImportProject to OptOut in Gitalygitaly-import-project-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Repository#info_attributes to OptOut in gitaly See merge request gitlab-org/gitlab-ce!19092 | ||||
| | * | | | | | | | | | | Move Repository#info_attributes to OptOut in gitalygitaly-repo-info-attributes-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
| | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch ↵ | Douwe Maan | 2018-05-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master' Resolve "notifications broken during email address change before email confirmed" Closes #22846 See merge request gitlab-org/gitlab-ce!18474 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |