summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Properly enable WebMock in Capybara testssh-fix-webmockStan Hu2018-01-091-1/+2
* Revert "Fix Route validation for unchanged path"Michael Kozono2018-01-092-61/+1
* Revert "Add test for permanent redirects of descendants"Michael Kozono2018-01-091-14/+0
* Add test for permanent redirects of descendantsMichael Kozono2018-01-091-0/+14
* Fix Route validation for unchanged pathMichael Kozono2018-01-092-1/+61
* Merge branch 'fj-41477-fix-bug-wiki-last-version' into 'master'Douwe Maan2018-01-094-0/+91
|\
| * Fixing bug related to wiki last versionFrancisco Javier López2018-01-094-0/+91
|/
* Merge branch 'improve-ssh-lookup-docs' into 'master'Douwe Maan2018-01-092-28/+6
|\
| * Use the new gitlab-shell authorized-keys helper in documentationNick Thomas2018-01-092-28/+6
* | Merge branch '41570-max-height-dropdown' into 'master'Phil Hughes2018-01-095-11/+7
|\ \ | |/ |/|
| * Change max-height of all dropdowns to 312px41570-max-height-dropdownAnnabel Dunstone Gray2018-01-085-11/+7
* | Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-095-4/+25
|\ \
| * | Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsisPhil Hughes2018-01-095-4/+25
* | | Merge branch 'master' into 'master'Achilleas Pipinellis2018-01-091-1/+1
|\ \ \
| * | | fix example in ci ssh_keys documentationVincent Lae2017-12-211-1/+1
* | | | Merge branch 'docs-push-web-hook-note' into 'master'Achilleas Pipinellis2018-01-091-0/+6
|\ \ \ \
| * | | | Add note about only 20 commits being included in push payloaddocs-push-web-hook-noteDrew Blessing2017-12-271-0/+6
* | | | | Merge branch 'docs/rs-fix-changelog-header-level' into 'master'Achilleas Pipinellis2018-01-091-1/+1
|\ \ \ \ \
| * | | | | Fix the header level for the Changelog Arguments documentationdocs/rs-fix-changelog-header-levelRobert Speicher2017-12-281-1/+1
* | | | | | Merge branch 'docs-19843-specify-archive-sha-options' into 'master'Achilleas Pipinellis2018-01-091-1/+1
|\ \ \ \ \ \
| * | | | | | Specifies the accepted refs for downloading an archive via the APIMark Fletcher2018-01-041-1/+1
* | | | | | | Merge branch 'patch-24' into 'master'Achilleas Pipinellis2018-01-091-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Update irker documentation to mention an irker bug with key-protected channels.Mattia Rizzolo2018-01-081-1/+5
* | | | | | | | 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
View Lorry Controller Status