summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-7' into 'master'docs-backport-ee-5794-to-ceMarcia Ramos2018-05-241-2/+2
* Merge branch '46723-api-created-issue-do-not-get-assigned-to-specified-milest...Achilleas Pipinellis2018-05-242-4/+4
|\
| * Clarify milestone_id scope for API operations on IssuablesMark Fletcher2018-05-242-4/+4
* | Merge branch '5778_rename_container_scanning_job_and_artifact' into 'master'Achilleas Pipinellis2018-05-242-12/+19
|\ \
| * | Rename container scanning job and artifactOlivier Gonzalez2018-05-242-12/+19
|/ /
* | Merge branch 'docs-update-backup-restore-guide' into 'master'Achilleas Pipinellis2018-05-241-6/+6
|\ \
| * | add info about the current format of the backup name and refresh examples of ...Alexander Tanayno2018-05-241-6/+6
|/ /
* | Merge branch '46741-add-access-control-allow-headers-wds' into 'master'Mike Greiling2018-05-241-1/+4
|\ \
| * | Add `Access-Control-Allow-Headers` to Webpack Dev Server configKushal Pandya2018-05-241-1/+4
* | | Merge branch 'ce-jej/saml-failure-messages' into 'master'Grzegorz Bizon2018-05-243-2/+17
|\ \ \
| * | | Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messagesJames Edwards-Jones2018-05-213-2/+17
* | | | Merge branch 'fl-loading-icon' into 'master'Phil Hughes2018-05-243-4/+22
|\ \ \ \
| * | | | Show loading icon only when making the requestfl-loading-iconFilipa Lacerda2018-05-233-4/+22
| | |/ / | |/| |
* | | | Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-2424-85/+373
|\ \ \ \
| * | | | Add specMark Chao2018-05-241-22/+34
| * | | | Avoid race condition of re-triggering mark_as_uncheckedMark Chao2018-05-181-2/+2
| * | | | Plural reason(s)Mark Chao2018-05-184-5/+6
| * | | | Create TODO when MR became unmergeablelulalala2018-05-176-53/+38
| * | | | Notify with email when merge request became unmergeablelulalala2018-05-1712-0/+191
| * | | | Add MergeRequest#merge_participantslulalala2018-05-172-0/+45
| * | | | Add cannot_be_merged_recheck merge_statuslulalala2018-05-177-9/+62
| * | | | Update doclulalala2018-05-171-0/+1
| * | | | Update doc redirect linklulalala2018-05-171-1/+1
* | | | | Merge branch 'jprovazn-fix-resolvable' into 'master'Douwe Maan2018-05-243-1/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Check if note's noteable is not nil when checking resolvabilityjprovazn-fix-resolvableJan Provaznik2018-05-233-1/+14
* | | | | Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master'Mike Greiling2018-05-243-1/+30
|\ \ \ \ \
| * | | | | Closes MR check out branch modal with escapeJacopo2018-05-223-1/+30
* | | | | | Update CHANGELOG.md for 10.8.1Mayra Cabrera2018-05-239-40/+15
* | | | | | Merge branch '39710-search-placeholder-cut-off' into 'master'Annabel Gray2018-05-237-29/+16
|\ \ \ \ \ \
| * | | | | | Fixes: Runners search input placeholder is cut offJacopo2018-05-237-29/+16
| |/ / / / /
* | | | | | Merge branch 'ldap-u2f-fix' into 'master'Mike Greiling2018-05-232-0/+8
|\ \ \ \ \ \
| * | | | | | Fixed U2F authentication when used with LDAPPhil Hughes2018-05-232-0/+8
* | | | | | | 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
View Lorry Controller Status