summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Force FoundBlob to use BlobPresentercache-highlight-2Mark Chao2018-09-071-0/+5
* Add language_from_gitattribute for SearchResults::FoundBlobMark Chao2018-09-071-0/+5
* Add trait to skip gitattribute access in specMark Chao2018-09-072-1/+9
* fix Gitlab::Conflict::FileMark Chao2018-09-071-1/+1
* tryMark Chao2018-09-0713-20/+23
* Add BlobPresenterMark Chao2018-09-073-1/+77
* blob.langMark Chao2018-09-073-3/+9
* Make Highlight accept language instead of repositoryMark Chao2018-09-072-33/+12
* Allow Blob to access its language from gitattributesMark Chao2018-09-072-0/+22
* Add spec for Gitlab::Git::Repository#attributesMark Chao2018-09-072-5/+37
* Merge branch 'remove-zebra-table-background' into 'master'Mike Greiling2018-09-063-2/+7
|\
| * Add changelog entryAndreas Kämmerle2018-09-061-0/+5
| * Remove striped table styling of Admin Area Applications viewAndreas Kämmerle2018-09-061-1/+1
| * Remove striped table styling of Find files viewAndreas Kämmerle2018-09-061-1/+1
* | Merge branch '33475-files-inside-wiki-repo-fe' into 'master'Mike Greiling2018-09-064-12/+88
|\ \
| * | Create spec for dropzone_input and refactor for testabilityPaul Slaughter2018-09-062-1/+71
| * | Fix error message handling in dropzone_inputPaul Slaughter2018-09-061-3/+14
| * | Refactor uploads_path to form data in wikis/editPaul Slaughter2018-09-063-8/+3
* | | Merge branch '49644-make-margin-of-user-status-emoji-consistent' into 'master'Mike Greiling2018-09-064-2/+20
|\ \ \
| * | | set margin for user status emoji globally49644-make-margin-of-user-status-emoji-consistentMartin Wortschack2018-08-264-23/+10
| * | | resolves MR discussions:Martin Wortschack2018-08-214-6/+6
| * | | keeps margin for user status emojis consistentMartin Wortschack2018-08-175-2/+33
* | | | Merge branch '50535-display-banner-to-notify-user-if-project-is-implicitly-op...Mike Greiling2018-09-067-0/+94
|\ \ \ \
| * | | | Displays banner to notify users ADO is implicitly enabledMayra Cabrera2018-09-067-0/+94
* | | | | Merge branch '49632-clean-up-the-top-section-of-the-cluster-page' into 'master'Clement Ho2018-09-0611-74/+64
|\ \ \ \ \
| * | | | | Resolve "Clean up the top section of the cluster page"Mike Greiling2018-09-0611-74/+64
|/ / / / /
* | | | | Merge branch 'eslint-update-no-param-reassign' into 'master'Mike Greiling2018-09-0614-15/+13
|\ \ \ \ \
| * | | | | Updapte eslintrc no-param-reassign with 'ignorePropertyModificationsFor'Paul Slaughter2018-09-0614-15/+13
* | | | | | Merge branch '7211-geo-synchronization-does-not-seem-to-replicate-default-bra...Stan Hu2018-09-068-6/+64
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add Gitlab::Git::Repository#find_remote_root_refDouglas Barbosa Alexandre2018-09-062-0/+35
| * | | | | Add Gitlab::GitalyClient::RemoteService#find_remote_root_refDouglas Barbosa Alexandre2018-09-062-0/+23
| * | | | | Use Giitaly version 0.119.0Douglas Barbosa Alexandre2018-09-061-1/+1
| * | | | | Use gitaly-proto 0.117.0Douglas Barbosa Alexandre2018-09-063-5/+5
* | | | | | Merge branch '39923-automatically-disable-auto-devops-for-project' into 'master'Kamil Trzciński2018-09-0624-34/+496
|\ \ \ \ \ \
| * | | | | | Automatically disable Auto DevOps for project upon first pipeline failureMayra Cabrera2018-09-0624-34/+496
|/ / / / / /
* | | | | | Merge branch 'issue_50980' into 'master'Kamil Trzciński2018-09-061-2/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Disable statement timeout in RenameLoginRootNamespaces migrationFelipe Artur2018-09-061-2/+6
* | | | | | Merge branch '43140-reduce-logs-tree-load' into 'master'51201-document-review-appsRémy Coutable2018-09-067-38/+368
|\ \ \ \ \ \
| * | | | | | Properly fix an introduced N+1 SQL issue loading commit authorsNick Thomas2018-09-062-6/+4
| * | | | | | Add changelogNick Thomas2018-09-061-0/+5
| * | | | | | Extract tree summary logic out of RefsController#logs_treeNick Thomas2018-09-063-45/+337
| * | | | | | Deduplicate commits before rendering them in RefsController#logs_treeNick Thomas2018-09-061-14/+19
| * | | | | | Bulk-render commit titles in the tree view to improve performanceNick Thomas2018-09-064-4/+34
* | | | | | | Merge branch '50657-migrate-issue-labels-and-milestone-to-related-mr-on-creat...Nick Thomas2018-09-067-19/+61
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Migrate issue labels and milestone to related merge request"Tiago Botelho2018-09-067-19/+61
|/ / / / / / /
* | | | | | | Merge branch '46340-remove-extra-spaces-from-mr-discussion-notes-after-vuejs'...Annabel Dunstone Gray2018-09-067-33/+17
|\ \ \ \ \ \ \
| * | | | | | | Remove extra spaces from MR discussion notesTakuya Noguchi2018-09-057-33/+17
* | | | | | | | Merge branch '50695-ce-documentation-is-not-commonmark-compliant-docs' into '...Sean McGivern2018-09-06105-1734/+1809
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "CE documentation is not CommonMark compliant"Brett Walker2018-09-06105-1734/+1809
|/ / / / / / / /
* | | | | | | | Merge branch 'ccr/6699_image_for_object_error' into 'master'Robert Speicher2018-09-063-0/+22
|\ \ \ \ \ \ \ \