summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix conflict warning being incorrectly displayed44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lieHeinrich Lee Yu2019-08-123-48/+73
* Merge branch 'docs-chatops-version' into 'master'Evan Read2019-08-121-5/+5
|\
| * Fix introduced section in chatops docMarcel Amirault2019-08-121-5/+5
|/
* Merge branch 'docs-mdl-rules-update-2' into 'master'Evan Read2019-08-1218-250/+186
|\
| * Add more rules to markdown lint checkMarcel Amirault2019-08-1218-250/+186
|/
* Merge branch 'bump-nokogiri-1.10.4' into 'master'Stan Hu2019-08-124-7/+7
|\
| * Bump nokogiri to 1.10.4bump-nokogiri-1.10.4Thong Kuah2019-08-124-7/+7
* | Merge branch 'valexieva-subgroups-CA' into 'master'Evan Read2019-08-121-1/+2
|\ \ | |/ |/|
| * adding subgroups to docsVirjinia Alexieva2019-08-121-1/+2
|/
* Merge branch '13439-fix-broken-karma-test-on-ee-side' into 'master'Paul Slaughter2019-08-112-5/+13
|\
| * Update karma for new expansion cell markupAndré Luís2019-08-112-5/+13
|/
* Merge branch 'emilie-master-patch-19291' into 'master'Achilleas Pipinellis2019-08-111-2/+3
|\
| * Update note regarding memory teamEmilie Schario2019-08-111-2/+3
|/
* Merge branch 'sh-update-ffi' into 'master'Ash McKenzie2019-08-101-1/+1
|\
| * Update ffi gem to 1.11.1sh-update-ffiStan Hu2019-08-101-1/+1
|/
* Merge branch 'ce-docker_image_replication_node_status' into 'master'Douglas Barbosa Alexandre2019-08-103-0/+32
|\
| * Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14943ce-docker_image_replication_node_statusValery Sizov2019-08-073-0/+32
* | Merge branch '58035-expand-mr-diff' into 'master'Mike Greiling2019-08-1027-130/+780
|\ \
| * | Replace ... with new expansion optionsSamantha Ming2019-08-1027-130/+780
|/ /
* | Merge branch 'id-mr-widget-etag-caching' into 'master'Douwe Maan2019-08-0919-453/+560
|\ \
| * | Split MR widget into cached and non-cached serializersIgor2019-08-0919-453/+560
|/ /
* | Merge branch 'spec-differences' into 'master'Robert Speicher2019-08-091-1/+1
|\ \
| * | Backport EE code for OAuth applications specspec-differencesYorick Peterse2019-08-091-1/+1
* | | Merge branch 'issue_58494' into 'master'Robert Speicher2019-08-093-1/+29
|\ \ \
| * | | Prevent rewritting plain links as embeddedissue_58494Felipe Artur2019-08-073-1/+29
* | | | Merge branch 'scripts-differences' into 'master'Robert Speicher2019-08-091-126/+0
|\ \ \ \
| * | | | Removed duplicate functions from utils.shscripts-differencesYorick Peterse2019-08-091-126/+0
| | |/ / | |/| |
* | | | Merge branch 'tr-remove-embed-metrics-flag' into 'master'Robert Speicher2019-08-099-65/+8
|\ \ \ \
| * | | | Remove gfm_embed_metrics flag from BETristan Read2019-08-099-65/+8
|/ / / /
* | | | Merge branch 'lm-download-csv-of-charts-from-metrics-dashboard' into 'master'Clement Ho2019-08-0910-7/+83
|\ \ \ \
| * | | | Adds button to download metrics data as csvLaura Montemayor2019-08-0910-7/+83
|/ / / /
* | | | Merge branch 'sh-bump-gitlab-workhorse-8.8.0' into 'master'Douglas Barbosa Alexandre2019-08-091-1/+1
|\ \ \ \
| * | | | Bump GitLab Workhorse to v8.8.0Stan Hu2019-08-091-1/+1
* | | | | Merge branch '13208-epicissue-has-an-unexpected-default-relative-position-ce'...Bob Van Landuyt2019-08-093-5/+15
|\ \ \ \ \
| * | | | | Remove default relative_position value13208-epicissue-has-an-unexpected-default-relative-position-ceHeinrich Lee Yu2019-08-093-5/+15
* | | | | | Merge branch '59712-resolve-the-search-problem-issue' into 'master'Paul Slaughter2019-08-0910-28/+196
|\ \ \ \ \ \
| * | | | | | Add repo-refs control for search pageminghuan lei2019-08-0910-28/+196
|/ / / / / /
* | | | | | Merge branch 'revert-d61dab91' into 'master'Bob Van Landuyt2019-08-097-93/+29
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Revert "Merge branch '65152-selective-highlight' into 'master'"revert-d61dab91Patrick Bajao2019-08-097-93/+29
* | | | | | Merge branch 'fix-job-log-formatting' into 'master'Filipa Lacerda2019-08-092-5/+5
|\ \ \ \ \ \
| * | | | | | Fix job log where spans were displayed in blockfix-job-log-formattingFabio Pitino2019-08-092-5/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '64730-metrics-dashboard-menu-is-cramped-with-new-features-enabl...Clement Ho2019-08-093-102/+138
|\ \ \ \ \ \
| * | | | | | Improve layout of dropdowns in metrics pageMiguel Rincon2019-08-093-102/+138
|/ / / / / /
* | | | | | Merge branch '62137-add-tooltip-to-improve-clarity-of-detached-label-state-in...Clement Ho2019-08-094-5/+14
|\ \ \ \ \ \
| * | | | | | Resolve "Add tooltip to improve clarity of "detached" label/state in the merg...Nick Kipling2019-08-094-5/+14
|/ / / / / /
* | | | | | Merge branch 'app-differences' into 'master'Rémy Coutable2019-08-091-1/+3
|\ \ \ \ \ \
| * | | | | | Backport EE changes to Members::BaseServiceapp-differencesYorick Peterse2019-08-081-1/+3
* | | | | | | Merge branch 'lib-differences' into 'master'Rémy Coutable2019-08-092-1/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Backport EE changes to ProjectSearchResultslib-differencesYorick Peterse2019-08-081-1/+3
| * | | | | | Backport EE changes to the project import APIYorick Peterse2019-08-081-0/+1
| |/ / / / /