summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added fuzzy file finder to merge requestsPhil Hughes2019-02-0522-304/+404
* Merge branch 'pl-serialize-ac-parameters' into 'master'Sean McGivern2019-02-053-6/+79
|\
| * Make `ActionContorller::Parameters` serializable for sidekiq jobsPeter Leitzen2019-02-053-6/+79
|/
* Merge branch 'fe-grammar-util' into 'master'Phil Hughes2019-02-053-0/+84
|\
| * Add grammar utilPaul Slaughter2019-02-043-0/+84
* | Merge branch 'search-title' into 'master'Sean McGivern2019-02-0513-5/+132
|\ \
| * | Fix grammar and spellingHiroyuki Sato2019-02-058-15/+15
| * | Add 'in' filter that modifies scope of 'search' filter to issues and merge re...Hiroyuki Sato2019-01-1413-5/+132
* | | Merge branch 'refactor/56370-extract-reply-placeholder-component' into 'master'Phil Hughes2019-02-056-25/+79
|\ \ \
| * | | Extract ReplyPlaceholder from NoteableDiscussion componentWinnie Hellmann2019-02-056-25/+79
|/ / /
* | | Merge branch 'adriel-add-deployment-data' into 'master'Phil Hughes2019-02-052-0/+43
|\ \ \
| * | | Add deployment dataAdriel Santiago2019-02-042-0/+43
* | | | Merge branch 'tz-update-register-element-for-emojis' into 'master'Phil Hughes2019-02-053-14/+17
|\ \ \ \
| * | | | Updated document-register-element and registering emojis in the new wayTim Zallmann2019-02-053-14/+17
|/ / / /
* | | | Merge branch 'update-pages-config-only-when-changed' into 'master'Grzegorz Bizon2019-02-053-14/+57
|\ \ \ \
| * | | | Do not reload daemon if configuration file of pages does not changeKamil Trzciński2019-01-163-22/+48
| * | | | Update pages config only when changedKamil Trzciński2019-01-161-3/+20
* | | | | Merge branch '57227-absolute-uri-missing-hierarchical-segment' into 'master'Sean McGivern2019-02-053-1/+17
|\ \ \ \ \
| * | | | | Catch possible Addressable::URI::InvalidURIErrorBrett Walker2019-02-043-1/+17
* | | | | | Merge branch 'update-pages-extensionless-urls' into 'master'Evan Read2019-02-043-1/+57
|\ \ \ \ \ \
| * | | | | | Add support for extensionless pages URLsNick Thomas2019-02-043-1/+57
* | | | | | | Merge branch 'renovate/gitlab-ui-2.x' into 'master'Annabel Dunstone Gray2019-02-042-5/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Update dependency @gitlab/ui to ^2.0.2Lukas 'Eipi' Eipert2019-02-042-5/+5
* | | | | | | Merge branch 'ssh-host-key-indifferent' into 'master'Stan Hu2019-02-042-0/+24
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Allow SshHostKey.find_by to accept string keysNick Thomas2019-02-042-0/+24
* | | | | | | Merge branch 'adriel-handle-echarts-resize-events' into 'master'Phil Hughes2019-02-045-30/+86
|\ \ \ \ \ \ \
| * | | | | | | Handle window and container resize eventsAdriel Santiago2019-02-045-30/+86
| |/ / / / / /
* | | | | | | Merge branch 'fe-api-group-members' into 'master'Phil Hughes2019-02-042-0/+23
|\ \ \ \ \ \ \
| * | | | | | | Add groupMembers to api.jsPaul Slaughter2019-02-032-0/+23
* | | | | | | | Merge branch 'tz-gitlab-ui-include' into 'master'Phil Hughes2019-02-043-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | gitlab-ui update with the new charting setupTim Zallmann2019-02-043-6/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'fj-regression-external-wiki-url' into 'master'Rémy Coutable2019-02-043-9/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Changed external wiki query method to prevent attribute cachingFrancisco Javier López2019-02-043-9/+9
* | | | | | | | Merge branch 'gt-externalize-app-views-instance_statistics' into 'master'Fatih Acet2019-02-046-10/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Externalize strings from `/app/views/instance_statistics`George Tsiolis2019-02-046-10/+42
* | | | | | | | | Merge branch 'update-workhorse-8-2-0' into 'master'Sean McGivern2019-02-042-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Workhorse to v8.2.0Nick Thomas2019-02-042-1/+6
* | | | | | | | | | Merge branch 'fe-update-common-styles' into 'master'Annabel Dunstone Gray2019-02-041-1/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Replace h-13em with h-12emPaul Slaughter2019-02-031-1/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ce-mr-widget-service-endpoints-method' into 'master'Phil Hughes2019-02-041-3/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Extract extension method from mr_widget_optionsPaul Slaughter2019-02-031-3/+5
| |/ / / / / / /
* | | | | | | | Merge branch '46448-add-timestamps-for-each-stage-of-gitlab-rake-gitlab-backu...Rémy Coutable2019-02-043-59/+76
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into '46448-add-timestamps-for-each-stage-of-gitlab-rak...Rémy Coutable2019-02-0411599-145620/+755016
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Add timestamps to gitlab-rake gitlab:backup:restoreWill Chandler2018-06-143-58/+76
* | | | | | | | | Merge branch '51759-filter-by-language' into 'master'Andreas Brandl2019-02-046-0/+74
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add programming language filtering to `/projects`Dylan MacKenzie2019-02-046-0/+74
|/ / / / / / / /
* | | | | | | | Merge branch 'fine-tune-review-app-resource-requests' into 'master'Rémy Coutable2019-02-041-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Only use 2 replicas for nginx-ingress.controllerRémy Coutable2019-02-011-0/+1
| * | | | | | | | Don't install Prometheus in Review AppsRémy Coutable2019-02-011-0/+1
| * | | | | | | | Fine-tune Review Apps pod resource requestsRémy Coutable2019-02-011-0/+3