summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Correct file-header spacing on compare page56938-diff-file-headers-on-compare-not-quite-rightSam Bigelow2019-02-058-19/+40
* 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
* | | | | | Merge branch 'sh-fix-oauth2-callback-caps' into 'master'Douglas Barbosa Alexandre2019-02-042-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Downcase aliased OAuth2 callback providersStan Hu2019-02-012-1/+6
* | | | | | Merge branch 'sh-fix-detect-host-keys' into 'master'Nick Thomas2019-02-043-1/+12
|\ \ \ \ \ \
| * | | | | | Fix SSH Detect Host Keys not workingStan Hu2019-02-033-1/+12
* | | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2019-02-042-4/+4
|\ \ \ \ \ \ \
| * | | | | | | accured -> occurred, as suggested in…Yaron Shahrabani2019-02-042-4/+4
|/ / / / / / /
* | | | | | | Merge branch '55199-schema-and-model-changes' into 'master'Sean McGivern2019-02-047-9/+278
|\ \ \ \ \ \ \
| * | | | | | | DB and model changes for Sentry project selection dropdownReuben Pereira2019-02-047-9/+278
|/ / / / / / /
* | | | | | | Merge branch '49388-refactor' into 'master'Grzegorz Bizon2019-02-041-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Refactor envs helper for claritysyasonik2019-01-291-3/+3
* | | | | | | | Merge branch 'ee-1979-1-3-fix-approvals-required' into 'master'Sean McGivern2019-02-042-4/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Consume remaining MigrateApproverToApprovalRulesInBatchMark Chao2019-02-022-4/+43
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'adriel-use-echarts-metrics-dashboard' into 'master'Phil Hughes2019-02-043-26/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Use ECharts for metrics dashboardAdriel Santiago2019-02-013-26/+17
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'issue_55744' into 'master'Sean McGivern2019-02-046-3/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix template labelsFelipe Artur2019-02-046-3/+71
|/ / / / / / / /
* | | | | | | | Merge branch '50521-block-emojis-and-symbol-characters-from-user-s-full-names...Filipa Lacerda2019-02-047-22/+73
|\ \ \ \ \ \ \ \
| * | | | | | | | Block emojis from user nameMartin Wortschack2019-02-017-22/+73
* | | | | | | | | Merge branch 'if-7693-smartcard_ldap_integration-ee_backport' into 'master'Dmitriy Zaporozhets2019-02-042-8/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport of ee/9235: Add LDAP integration to smartcard authenticationImre Farkas2019-01-272-8/+13
* | | | | | | | | | Merge branch 'fix-rubocop' into 'master'Rémy Coutable2019-02-043-11/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix warning already initialized constantSemyon Pupkov2019-02-011-1/+1