summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove fixed height from MR diff headersremove-mr-diff-header-heightAnnabel Dunstone Gray2019-05-313-2/+6
* Merge branch '61988-collapse-icon-on-merge-request-diff-larger-than-profile-p...Annabel Dunstone Gray2019-05-316-18/+29
|\
| * Resize collapse icon to profile picture sizeMarcel van Remmerden2019-05-316-18/+29
|/
* Merge branch '50850-kerrizor-extend-api-to-accept-start_project-option' into ...Lin Jen-Shin2019-05-314-0/+108
|\
| * Add optional param :start_project to allow variable commit targetsKerri Miller2019-05-314-0/+108
|/
* Merge branch 'gitaly-version-v1.43.0' into 'master'Bob Van Landuyt2019-05-3112-156/+9
|\
| * Remove hook directory requirement from Shellgitaly-version-v1.43.0Zeger-Jan van de Weg2019-05-3010-155/+3
| * Add changelog entryGitalyBot2019-05-301-0/+5
| * Update Gitaly version to v1.43.0GitalyBot2019-05-301-1/+1
* | Merge branch 'weimeng-email-routing' into 'master'Sean McGivern2019-05-3127-68/+210
|\ \
| * | Apply reviewer suggestionsweimeng-email-routingWei-Meng Lee2019-05-313-5/+4
| * | Move method into groupWei-Meng Lee2019-05-312-1/+5
| * | Simplify logic using new group notification settings methodWei-Meng Lee2019-05-311-17/+5
| * | Guarantee order of notification settingsWei-Meng Lee2019-05-313-14/+12
| * | Move group_notification_email outside conditionalWei-Meng Lee2019-05-311-2/+1
| * | Fix typo in project invitation declined testWei-Meng Lee2019-05-312-2/+2
| * | Add group-level notification emails to docsWei-Meng Lee2019-05-312-2/+6
| * | Send notifications to group-specific email addressWei-Meng Lee2019-05-3120-44/+182
| * | Add notification_email to NotificationSettingWei-Meng Lee2019-05-312-0/+12
* | | Merge branch 'proof-read' into 'master'Jan Provaznik2019-05-312-4/+4
|\ \ \
| * | | Fix typo & run bin/rake gettext:regenerateKatrin Leinweber2019-05-302-4/+4
* | | | Merge branch '60987-emoji-picker-popup' into 'master'Kushal Pandya2019-05-313-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix emoji picker visibility issueFatih Acet2019-05-313-0/+7
* | | | Merge branch '59587-add-graphql-logging' into 'master'Sean McGivern2019-05-3110-19/+238
|\ \ \ \ | |/ / / |/| | |
| * | | Apply reviewer feedback59587-add-graphql-loggingcharlie ablett2019-05-317-55/+82
| * | | Move complexity/depth to `final_value`charlieablett2019-05-304-38/+33
| * | | Add `graphql_json` logfile documentationcharlieablett2019-05-301-0/+13
| * | | Call analyzers from LoggerAnalyzercharlieablett2019-05-306-51/+51
| * | | Add GraphQL logging feature flagcharlieablett2019-05-302-2/+19
| * | | Restructure complexity analyzercharlieablett2019-05-304-30/+78
| * | | Implement logger analyzercharlieablett2019-05-307-39/+108
| * | | New logfile for graphql queriescharlieablett2019-05-304-1/+51
* | | | Merge branch 'remove-legacy-artifacts-related-code' into 'master'Kamil TrzciƄski2019-05-3124-522/+94
|\ \ \ \
| * | | | Remove legacy artifact related coderemove-legacy-artifacts-related-codeShinya Maeda2019-05-3124-522/+94
* | | | | Merge branch '62432-fix-participants-wrapping' into 'master'Annabel Dunstone Gray2019-05-312-4/+7
|\ \ \ \ \
| * | | | | Update participants paddingJacques Erasmus2019-05-312-4/+7
|/ / / / /
* | | | | Merge branch 'docs-its-relative-5' into 'master'Achilleas Pipinellis2019-05-3116-31/+30
|\ \ \ \ \
| * | | | | Docs: Convert links in various docs to relativeMarcel Amirault2019-05-3116-31/+30
|/ / / / /
* | | | | Merge branch 'docs-its-relative-4' into 'master'Achilleas Pipinellis2019-05-3112-29/+29
|\ \ \ \ \
| * | | | | Docs: Convert remaining links in /user to relativeMarcel Amirault2019-05-3112-29/+29
|/ / / / /
* | | | | Merge branch 'docs-hackathon-1' into 'master'Achilleas Pipinellis2019-05-311-10/+8
|\ \ \ \ \
| * | | | | Docs: Add introduced column to table in Personal Access Tokens docMarcel Amirault2019-05-311-10/+8
|/ / / / /
* | | | | Merge branch 'docs-its-relative-3' into 'master'Achilleas Pipinellis2019-05-3112-33/+33
|\ \ \ \ \
| * | | | | Docs: Finish changing links to relative in user/project (part 2)Marcel Amirault2019-05-3112-33/+33
|/ / / / /
* | | | | Merge branch 'docs-its-relative-2' into 'master'Achilleas Pipinellis2019-05-3121-54/+46
|\ \ \ \ \
| * | | | | Docs: Change links to relative in /user/project (Part 1)Marcel Amirault2019-05-3121-54/+46
|/ / / / /
* | | | | Merge branch 'docs-hackathon-4' into 'master'Achilleas Pipinellis2019-05-311-132/+129
|\ \ \ \ \
| * | | | | Docs: Clean up tables in permissions docMarcel Amirault2019-05-311-132/+129
|/ / / / /
* | | | | Merge branch 'add-constraint-for-milestone-dates' into 'master'Sean McGivern2019-05-315-16/+74
|\ \ \ \ \
| * | | | | Change query to work on mysql as well. Also set entire date because setting o...Luke Picciau2019-05-315-16/+74
|/ / / / /