summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow search results to accept project_idadd-language-param-to-highlightMark Chao2018-10-301-1/+6
* Centralize loading blob data before highlightingMark Chao2018-10-301-0/+2
* Allow FoundBlob to access language from gitattributesMark Chao2018-10-307-31/+46
* Move :plain option to Highlight classMark Chao2018-10-309-88/+74
* Make Highlight accept language paramMark Chao2018-10-3016-56/+64
* Add BlobPresenter for highlightingMark Chao2018-10-304-1/+82
* Add access to Blob's language from gitattributesMark Chao2018-10-303-0/+29
* Add spec for Gitlab::Git::Repository#attributesMark Chao2018-10-303-7/+45
* Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-10-3023-59/+66
|\
| * Merge branch 'bw-fix-spec-in-merge' into 'master'Stan Hu2018-10-301-1/+1
| |\
| | * Fix problem with spec that showed up in EE mergeBrett Walker2018-10-291-1/+1
| * | Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' in...Evan Read2018-10-301-0/+6
| |\ \ | | |/ | |/|
| | * Add deprecation notice for renamed licensed featuredocs-add_deprecation_notice_for_renamed_licensed_feature-ceOlivier Gonzalez2018-10-241-0/+6
| * | Merge branch 'patch-31' into 'master'Evan Read2018-10-301-0/+3
| |\ \
| | * | Added a note about machine typesMark Veenstra2018-10-301-0/+3
| |/ /
| * | Merge branch 'update-gitlab-ui' into 'master'Mike Greiling2018-10-2916-51/+51
| |\ \
| | * | Update gitlab-ui to 1.9.0Clement Ho2018-10-2916-51/+51
| |/ /
| * | Merge branch '53270-remove-mousetrap-rails' into 'master'Mike Greiling2018-10-294-7/+5
| |\ \
| | * | Remove mousetrap-rails gemTakuya Noguchi2018-10-284-7/+5
* | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-29406-3204/+6889
|\ \ \ \ | |/ / /
| * | | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-2925-47/+55
| |\ \ \
| | * | | Revert _diffs.html.hamlblackst0ne-update-push-new-merge-request-urlblackst0ne2018-10-271-1/+0
| | * | | Fix specsblackst0ne2018-10-268-16/+17
| | * | | Update other linksblackst0ne2018-10-2614-23/+25
| | * | | Make new merge request URL more friendly when pushing codeblackst0ne2018-10-236-9/+15
| * | | | Merge branch 'ml-qa-push-private-token' into 'master'Dan Davison2018-10-292-1/+33
| |\ \ \ \
| | * | | | Add e2e test to push using a private tokenml-qa-push-private-tokenMark Lapierre2018-10-292-1/+33
| * | | | | Merge branch '53273-update-moment-to-2-22-2' into 'master'Mike Greiling2018-10-292-6/+6
| |\ \ \ \ \
| | * | | | | Update moment to 2.22.2Takuya Noguchi2018-10-282-6/+6
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'pages-1-3-0' into 'master'Robert Speicher2018-10-291-1/+1
| |\ \ \ \ \
| | * | | | | Update GitLab Pages to v1.3.0Nick Thomas2018-10-291-1/+1
| * | | | | | Merge branch 'rails5-deprecated-uniq' into 'master'Robert Speicher2018-10-296-6/+11
| |\ \ \ \ \ \
| | * | | | | | Replace deprecated uniq on a Relation with distinctJasper Maes2018-10-266-6/+11
| * | | | | | | Merge branch '5979_rename_sast_container_gitlab_features-ce' into 'master'Kamil Trzciński2018-10-291-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Rename 'sast_container' licensed feature5979_rename_sast_container_gitlab_features-ceKamil Trzciński2018-10-291-1/+1
| * | | | | | | | Merge branch 'sh-bump-whitequark-parser' into 'master'Robert Speicher2018-10-291-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Upgrade whitequark/parser to 2.5.3.0sh-bump-whitequark-parserStan Hu2018-10-281-1/+1
| * | | | | | | | | Merge branch 'winh-delete-job-spec' into 'master'Filipa Lacerda2018-10-291-265/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Delete job_spec.jsWinnie Hellmann2018-10-291-265/+0
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'gt-truncate-milestone-title-on-collapsed-sidebar' into 'master'Clement Ho2018-10-292-1/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Truncate milestone title on collapsed sidebarGeorge Tsiolis2018-10-262-1/+6
| * | | | | | | | Merge branch '52122-fix-broken-whitespace-button' into 'master'Phil Hughes2018-10-294-7/+178
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix broken "Show whitespace changes" button on MR "Changes" tabJacques Erasmus2018-10-294-7/+178
| |/ / / / / / / /
| * | | | | | | | Merge branch '45669-table-in-jobs-on-pipeline' into 'master'Nick Thomas2018-10-296-52/+64
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Remove all tables from Pipeline page when there is no job for the PipelineTakuya Noguchi2018-10-296-52/+64
| |/ / / / / / /
| * | | | | | | Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into '...Nick Thomas2018-10-293-4/+34
| |\ \ \ \ \ \ \
| | * | | | | | | Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllersSean McGivern2018-10-262-1/+18
| | * | | | | | | Extract EE-specific lines from issues controllerSean McGivern2018-10-241-3/+16
| * | | | | | | | Merge branch '53155-structured-logs-params-array' into 'master'Sean McGivern2018-10-293-2/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix open-ended params for api_json.logAndrew Newdigate2018-10-293-2/+15
| |/ / / / / / / /
View Lorry Controller Status