Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'mr-conflict-notification' into 'master' | Douwe Maan | 2018-05-24 | 24 | -85/+373 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add spec | Mark Chao | 2018-05-24 | 1 | -22/+34 | |
| * | | | | | | | | | Avoid race condition of re-triggering mark_as_unchecked | Mark Chao | 2018-05-18 | 1 | -2/+2 | |
| * | | | | | | | | | Plural reason(s) | Mark Chao | 2018-05-18 | 4 | -5/+6 | |
| * | | | | | | | | | Create TODO when MR became unmergeable | lulalala | 2018-05-17 | 6 | -53/+38 | |
| * | | | | | | | | | Notify with email when merge request became unmergeable | lulalala | 2018-05-17 | 12 | -0/+191 | |
| * | | | | | | | | | Add MergeRequest#merge_participants | lulalala | 2018-05-17 | 2 | -0/+45 | |
| * | | | | | | | | | Add cannot_be_merged_recheck merge_status | lulalala | 2018-05-17 | 7 | -9/+62 | |
| * | | | | | | | | | Update doc | lulalala | 2018-05-17 | 1 | -0/+1 | |
| * | | | | | | | | | Update doc redirect link | lulalala | 2018-05-17 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'jprovazn-fix-resolvable' into 'master' | Douwe Maan | 2018-05-24 | 3 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Check if note's noteable is not nil when checking resolvabilityjprovazn-fix-resolvable | Jan Provaznik | 2018-05-23 | 3 | -1/+14 | |
* | | | | | | | | | | Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master' | Mike Greiling | 2018-05-24 | 3 | -1/+30 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Closes MR check out branch modal with escape | Jacopo | 2018-05-22 | 3 | -1/+30 | |
* | | | | | | | | | | Update CHANGELOG.md for 10.8.1 | Mayra Cabrera | 2018-05-23 | 9 | -40/+15 | |
* | | | | | | | | | | Merge branch '39710-search-placeholder-cut-off' into 'master' | Annabel Gray | 2018-05-23 | 7 | -29/+16 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | 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 | Phil Hughes | 2018-05-23 | 2 | -0/+8 | |
* | | | | | | | | | | | Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-... | Douwe Maan | 2018-05-23 | 15 | -181/+295 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Don't expire the current ApplicationSetting in config/initializers/1_settings.rb | Rémy Coutable | 2018-05-23 | 1 | -3/+0 | |
| * | | | | | | | | | | | Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes | Rémy Coutable | 2018-05-23 | 2 | -76/+69 | |
| * | | | | | | | | | | | Use ApplicationSetting.current_without_cache instead of ApplicationSetting.cu... | Rémy Coutable | 2018-05-23 | 4 | -4/+4 | |
| * | | | | | | | | | | | Use the new CacheableAttributes concern in the ApplicationSetting and Appeara... | Rémy Coutable | 2018-05-23 | 5 | -98/+11 | |
| * | | | | | | | | | | | Introduce a new CacheableAttributes concern | Rémy Coutable | 2018-05-23 | 3 | -0/+211 | |
* | | | | | | | | | | | | Merge branch 'akaemmerle-update-keyboard-shortcuts-doc' into 'master' | Achilleas Pipinellis | 2018-05-23 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | 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" 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 | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | 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 wit... | Tiago Botelho | 2018-05-22 | 1 | -0/+15 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master' | Douwe Maan | 2018-05-23 | 2 | -0/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Rollback changes made to CreateProjectMirrorData46630-add-missing-columns-to-project-mirror-data | Tiago Botelho | 2018-05-23 | 1 | -11/+7 | |
| * | | | | | | | | | | | | Renames AddMissingColumnsToProjectMirrorData to EnsureMissingColumnsToProject... | Tiago Botelho | 2018-05-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Adds changelog | Tiago Botelho | 2018-05-23 | 1 | -0/+5 | |
| * | | | | | | | | | | | | Adds migration to ensure the new project_mirror_data columns are indeed added... | Tiago Botelho | 2018-05-23 | 1 | -0/+15 | |
| * | | | | | | | | | | | | Edits create_project_mirror_data to add the new columns when table already ex... | Tiago Botelho | 2018-05-23 | 1 | -7/+11 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | 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 | 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 ...ce_backport_issue_5128 | Felipe Artur | 2018-05-22 | 2 | -6/+14 | |
* | | | | | | | | | | | | 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 | 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.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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |