summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update ffi to 1.9.25Takuya Noguchi2018-09-064-3/+8
* Merge branch '51092-fix-mr-diff-file-filter-clear-button' into 'master'Phil Hughes2018-09-063-1/+10
|\
| * Make MR diff file filter input Clear button functionalKushal Pandya2018-09-063-1/+10
|/
* Merge branch 'feature/git-v2-flag' into 'master'Nick Thomas2018-09-062-1/+6
|\
| * Add git_v2 flag to GitalyClientJames Lopez2018-09-062-1/+6
|/
* Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-0611-10/+87
|\
| * Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-0511-10/+87
* | Merge branch 'ash.mckenzie/geo-git-push-ssh-proxy' into 'master'Sean McGivern2018-09-066-36/+147
|\ \
| * | Custom Action support changelogAsh McKenzie2018-09-061-0/+5
| * | Update /api/v4/allowedAsh McKenzie2018-09-063-38/+103
| * | GitAccess#check custom action supportAsh McKenzie2018-09-061-1/+9
| * | New GitAccessResult::Success/CustomActionAsh McKenzie2018-09-062-0/+33
* | | Merge branch 'bvl-codeowners-file-ce' into 'master'Douwe Maan2018-09-069-183/+216
|\ \ \
| * | | Port changes for CODEOWNERS to CEBob Van Landuyt2018-09-069-183/+216
* | | | Merge branch '29398-support-kubernetes-rbac-for-gitlab-managed-apps' into 'ma...Kamil Trzciński2018-09-0644-93/+1302
|\ \ \ \
| * | | | Enable Kubernetes RBAC for GitLab Managed Apps for existing clustersThong Kuah2018-09-0644-93/+1302
|/ / / /
* | | | Merge branch 'docs/usage-statistics-typo' into 'master'Marcia Ramos2018-09-061-2/+4
|\ \ \ \
| * | | | Add link to EE MRAchilleas Pipinellis2018-09-061-0/+1
| * | | | link formatting and typoJames Komara2018-09-061-2/+3
| | |/ / | |/| |
* | | | Merge branch '44943-update-presentation-for-sso-providers-on-log-in-page' int...Phil Hughes2018-09-0618-51/+57
|\ \ \ \
| * | | | Resolve "Update presentation for SSO providers on log in page"Martin Wortschack2018-09-0618-51/+57
|/ / / /
* | | | Merge branch 'rails5-explicit-hashed-path-check' into 'master'Rémy Coutable2018-09-062-1/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Explicit hashed path check for trace, prevents background migration from acce...Jasper Maes2018-09-052-1/+9
* | | | Merge branch 'sh-add-ua-to-lograge-logs' into 'master'Sean McGivern2018-09-063-1/+8
|\ \ \ \
| * | | | Add User-Agent to production_json.logStan Hu2018-09-053-1/+8
| | |_|/ | |/| |
* | | | Merge branch 'bw-commonmark-for-files-docs' into 'master'Sean McGivern2018-09-061-8/+38
|\ \ \ \
| * | | | Update user markdown documentation for CommonMarkBrett Walker2018-09-061-8/+38
|/ / / /
* | | | Merge branch 'bw-commonmark-for-files' into 'master'Sean McGivern2018-09-0625-52/+285
|\ \ \ \
| * | | | remove guard clause and add comment on performaceBrett Walker2018-09-051-3/+7
| * | | | added feature flag 'commonmark_for_repositories'Brett Walker2018-09-054-2/+33
| * | | | add 'default_enabled' to feature flagsBrett Walker2018-09-054-8/+27
| * | | | move logic into legacy_render_context helper methodBrett Walker2018-09-059-16/+25
| * | | | render using RedCarpet if legacy_render parameter is setBrett Walker2018-09-0516-28/+181
| * | | | test that wiki links with spaces works in wiki pipelineBrett Walker2018-09-051-0/+14
| * | | | Enable CommonMark for files and wikisBrett Walker2018-09-054-10/+9
| * | | | url_helpers were not available on a code reloadBrett Walker2018-09-051-9/+13
| | |/ / | |/| |
* | | | Merge branch 'rs-line-break-around-conditional-cop' into 'master'Sean McGivern2018-09-062-1/+22
|\ \ \ \
| * | | | Fix LineBreakAroundConditionalBlock cop for a conditional after rescueRobert Speicher2018-09-052-1/+22
* | | | | Merge branch '44704-improve-project-overview-ui' into 'master'Phil Hughes2018-09-0632-354/+705
|\ \ \ \ \
| * | | | | Resolve "Improve project overview UI"Dennis Tang2018-09-0632-354/+705
|/ / / / /
* | | | | Merge branch 'monaco-upgrade' into 'master'Tim Zallmann2018-09-063-8/+13
|\ \ \ \ \
| * | | | | Upgraded Monaco editor versionPhil Hughes2018-09-053-8/+13
* | | | | | Merge branch 'ce-5306-more-custom-templates' into 'master'Robert Speicher2018-09-066-23/+139
|\ \ \ \ \ \
| * | | | | | Backport changes to Gitlab::Tempalte::BaseTemplateNick Thomas2018-09-051-2/+6
| * | | | | | Rename BlobsHelper#dropdown_namesNick Thomas2018-09-051-6/+6
| * | | | | | Allow the TemplateFinder to handle licenses as wellNick Thomas2018-09-053-3/+28
| * | | | | | Convert global templates to vendored templates via a ::TemplateFinderNick Thomas2018-09-054-19/+79
| * | | | | | Allow repositories to be programmatically built in the specsNick Thomas2018-09-051-0/+27
* | | | | | | Merge branch 'sh-bump-browser-gem' into 'master'Robert Speicher2018-09-053-5/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Bump browser gem to v2.5.3Stan Hu2018-09-053-5/+5
|/ / / / / /