summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix double execution of COUNT query on group pages41546-count-query-for-issues-and-mrs-runs-twice-on-group-indexSean McGivern2018-01-092-6/+11
* Merge branch 'fj-41681-add-param-disable-commit-stats-api' into 'master'Douwe Maan2018-01-097-3/+63
|\
| * Add option to disable commit stats to commit APIFrancisco Javier López2018-01-097-3/+63
|/
* Merge branch 'doc-development-architecture.md-remove-unnecessary-line' into '...Achilleas Pipinellis2018-01-091-2/+0
|\
| * Fix: remove unnecessary lineOnuwa Nnachi Isaac2018-01-081-2/+0
* | Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-0918-14/+749
|\ \
| * | Adds changelog for backport of authorized_keys DB lookup from EEjej/backport-authorized-keys-to-ceJames Edwards-Jones2018-01-081-0/+5
| * | Fix spec in shell_spec.rbJames Edwards-Jones2018-01-081-1/+1
| * | Fix typo in spec/requests/api/internal_spec.rbJames Edwards-Jones2018-01-081-1/+1
| * | Backport spec fixes in spec/lib/gitlab/shell_spec.rbValery Sizov2018-01-081-10/+12
| * | Make Gitlab::CurrentSettings available when getting settingsSean McGivern2018-01-081-8/+8
| * | Avoid adding index if already existsPaco Guzman2018-01-081-1/+2
| * | Backport authorized_keys_enabled defaults to true'Michael Kozono2018-01-085-7/+289
| * | Use ApplicationSetting.current in Admin::ApplicationSettingsControllerRémy Coutable2018-01-081-1/+1
| * | Combine ssh docs and rename the docErnst van Nierop2018-01-083-70/+194
| * | Backport option to disable writing to `authorized_keys` fileMichael Kozono2018-01-0811-13/+217
| * | Backport authorized_keys branch 'find-key-by-fingerprint'Pablo Carranza2018-01-085-0/+117
* | | Merge branch '36906_Reordering_issues_to_the_bottom' into 'master'Phil Hughes2018-01-093-1/+18
|\ \ \
| * | | Fixing re-ordering of an issue when dragging it to the bottom a long issue li...David Kuri2018-01-093-1/+18
|/ / /
* | | Merge branch 'move-markdown-preview' into 'master'Phil Hughes2018-01-093-184/+182
|\ \ \
| * | | Remove preview_markdown from the global objJacob Schatz2018-01-093-184/+182
* | | | Merge branch '41404-pipelines-charts' into 'master'Phil Hughes2018-01-093-8/+16
|\ \ \ \
| * | | | Change pipeline charts colors to match legend41404-pipelines-chartsAnnabel Dunstone Gray2018-01-083-8/+16
* | | | | Merge branch 'check-environment-regex-ce' into 'master'Grzegorz Bizon2018-01-092-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add speccheck-environment-regex-ceShinya Maeda2018-01-081-1/+2
| * | | | Merge branch 'check-environment-regex' into 'master'Grzegorz Bizon2018-01-081-1/+1
* | | | | Merge branch 'sh-store-user-in-api-logs' into 'master'Sean McGivern2018-01-095-1/+38
|\ \ \ \ \
| * | | | | Save user ID and username in Grape API log (api_json.log)sh-store-user-in-api-logsStan Hu2018-01-085-1/+38
* | | | | | Merge branch '41723-axios-mock-adapter' into 'master'Phil Hughes2018-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Resolve "Install dev dependencies as devDependencies instead of dependencies"Filipa Lacerda2018-01-091-1/+1
|/ / / / /
* | | | | Merge branch 'improve-table-pagination-spec' into 'master'Jacob Schatz2018-01-091-1/+1
|\ \ \ \ \
| * | | | | Improve table pagination specClement Ho2018-01-091-1/+1
|/ / / / /
* | | | | Merge branch '41683-timeout-is-not-set-for-gitaly-fetch_remote-calls' into 'm...Stan Hu2018-01-083-5/+24
|\ \ \ \ \
| * | | | | Pass timeout to RepositoryService.FetchRemote Gitaly RPC calls41683-timeout-is-not-set-for-gitaly-fetch_remote-callsAlejandro Rodríguez2018-01-053-5/+24
* | | | | | Merge branch 'dispatcher-dashboard-todos' into 'master'Jacob Schatz2018-01-084-7/+10
|\ \ \ \ \ \
| * | | | | | Refactor dashboard todos inside dispatcherClement Ho2018-01-084-7/+10
|/ / / / / /
* | | | | | Merge branch 'winh-fix-merge-request-spec' into 'master'Clement Ho2018-01-081-4/+11
|\ \ \ \ \ \
| * | | | | | Make tasklist:changed test in merge_request_spec.js asyncwinh-fix-merge-request-specWinnie Hellmann2018-01-081-4/+11
* | | | | | | Merge branch 'osw-merge-request-metrics-population-scheduler-improvement' int...Stan Hu2018-01-081-31/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary queries on Merge Request Metrics population schedulerOswaldo Ferreira2018-01-081-31/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix/dashboard-projects-nav-links-height' into 'master'Filipa Lacerda2018-01-082-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix dashboard projects nav links heightGeorge Tsiolis2018-01-032-1/+6
* | | | | | | | Merge branch 'winh-webpack-concatenated-module' into 'master'Jacob Schatz2018-01-081-5/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Webpack config for ConcatenatedModulewinh-webpack-concatenated-moduleWinnie Hellmann2018-01-041-5/+25
* | | | | | | | | Merge branch 'fix/remove-unnecessary-dashboard-scroll' into 'master'Annabel Dunstone Gray2018-01-081-4/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unnecessary dashboard scrollGeorge Tsiolis2018-01-041-4/+0
* | | | | | | | | | Merge branch '41744-substitute-ui-charcoal-with-ui-indigo' into 'master'Annabel Dunstone Gray2018-01-084-3/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Substitute deprecated ui_charcoal with new default ui_indigoTakuya Noguchi2018-01-074-3/+8
* | | | | | | | | | | Merge branch 'workhorse-3.4.0' into 'master'Sean McGivern2018-01-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use workhorse 3.4.0workhorse-3.4.0Jacob Vosmaer2018-01-081-1/+1
View Lorry Controller Status