summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-2419-24/+357
* Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-...Douwe Maan2018-05-2315-181/+295
|\
| * Don't expire the current ApplicationSetting in config/initializers/1_settings.rbRémy Coutable2018-05-231-3/+0
| * Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributesRémy Coutable2018-05-232-76/+69
| * Use ApplicationSetting.current_without_cache instead of ApplicationSetting.cu...Rémy Coutable2018-05-234-4/+4
| * Use the new CacheableAttributes concern in the ApplicationSetting and Appeara...Rémy Coutable2018-05-235-98/+11
| * Introduce a new CacheableAttributes concernRémy Coutable2018-05-233-0/+211
* | Merge branch 'akaemmerle-update-keyboard-shortcuts-doc' into 'master'Achilleas Pipinellis2018-05-231-3/+3
|\ \
| * | Update keyboard shortcut conventionsAndreas Kämmerle2018-05-231-3/+3
|/ /
* | Merge branch 'fix/devops-remove-beta' into 'master'Tim Zallmann2018-05-238-9/+10
|\ \
| * | removed "(Beta)" from "Auto DevOps" messagesfix/devops-remove-betaPaul Slaughter2018-05-218-9/+10
* | | Merge branch '46505-update-autodevops-docs' into 'master'Achilleas Pipinellis2018-05-231-0/+24
|\ \ \
| * | | Add documentation of variables usage for disabling/enabling jobs in Auto DevOpsTomasz Maczukin2018-05-231-0/+24
|/ / /
* | | Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'Rémy Coutable2018-05-232-1/+17
|\ \ \
| * | | Fix rubocop46259-prometheus-integration-fails-on-kube-1-10Tiago Botelho2018-05-231-0/+1
| * | | Update Prometheus URL spec for 1.10 formatJoshua Lambert2018-05-221-1/+1
| * | | Monkey patches Kubeclient::Client#proxy_url in order to make it compliant wit...Tiago Botelho2018-05-221-0/+15
* | | | Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master'Douwe Maan2018-05-232-0/+20
|\ \ \ \
| * | | | Rollback changes made to CreateProjectMirrorData46630-add-missing-columns-to-project-mirror-dataTiago Botelho2018-05-231-11/+7
| * | | | Renames AddMissingColumnsToProjectMirrorData to EnsureMissingColumnsToProject...Tiago Botelho2018-05-231-1/+1
| * | | | Adds changelogTiago Botelho2018-05-231-0/+5
| * | | | Adds migration to ensure the new project_mirror_data columns are indeed added...Tiago Botelho2018-05-231-0/+15
| * | | | Edits create_project_mirror_data to add the new columns when table already ex...Tiago Botelho2018-05-231-7/+11
* | | | | Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master'Rémy Coutable2018-05-233-26/+54
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Render 404 when prometheus adapter is disabled in Prometheus metrics controllerTiago Botelho2018-05-233-26/+54
|/ / / /
* | | | Merge branch 'ce_backport_issue_5128' into 'master'Rémy Coutable2018-05-232-6/+14
|\ \ \ \
| * | | | CE backport - Allow viewing only one board when multiple issue boards is not ...ce_backport_issue_5128Felipe Artur2018-05-222-6/+14
* | | | | Merge branch 'ce-5949-render_optional' into 'master'Rémy Coutable2018-05-233-2/+50
|\ \ \ \ \
| * | | | | CE: Use render_if_exists to hide EE specific codesLin Jen-Shin2018-05-233-2/+50
|/ / / / /
* | | | | Merge branch 'rs-boards-issues-create-service-parity' into 'master'Rémy Coutable2018-05-231-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bring CE-EE parity to app/services/boards/issues/create_service.rbrs-boards-issues-create-service-parityRobert Speicher2018-05-221-1/+5
* | | | | Merge branch 'use-git-depth-1-on-cng-trigger' into 'master'Rémy Coutable2018-05-231-0/+2
|\ \ \ \ \
| * | | | | Set GIT_DEPTH to 1 to speed up cloning for the cloud images triggeruse-git-depth-1-on-cng-triggerDJ Mountney2018-05-221-0/+2
| |/ / / /
* | | | | Merge branch 'issue-25256' into 'master'Douwe Maan2018-05-237-7/+72
|\ \ \ \ \
| * | | | | skip email trim when email is creating new issueCameron Crockett2018-05-227-7/+72
* | | | | | Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \ \ \
| * | | | | | Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-outKim Carlbäcker2018-05-221-1/+1
* | | | | | | Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Move Wiki::GetFormattedData to OptOutgitaly-wiki-get-formatted-data-opt-outKim Carlbäcker2018-05-221-1/+1
* | | | | | | | Merge branch 'gitaly-import-project-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Move ImportProject to OptOut in Gitalygitaly-import-project-opt-outKim Carlbäcker2018-05-221-1/+1
* | | | | | | | | Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move Repository#info_attributes to OptOut in gitalygitaly-repo-info-attributes-opt-outKim Carlbäcker2018-05-221-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '22846-notifications-broken-during-email-address-change-before-e...Douwe Maan2018-05-230-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge branch '46354-deprecate_gemnasium_service' into 'master'Douwe Maan2018-05-238-26/+70
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Deprecate Gemnasium project service"Olivier Gonzalez2018-05-238-26/+70
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '45530-web-ide-doesn-t-work-for-branches-with-slashes' into 'mas...Douwe Maan2018-05-237-21/+40
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Web IDE doesn't work for branches with slashes"Tim Zallmann2018-05-237-21/+40
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ide-commit-state-bug' into 'master'Filipa Lacerda2018-05-232-2/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixed specPhil Hughes2018-05-231-0/+1
View Lorry Controller Status