Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-error | Eric Eastwood | 2018-01-09 | 5 | -4/+33 |
* | Merge branch 'fj-41477-fix-bug-wiki-last-version' into 'master' | Douwe Maan | 2018-01-09 | 4 | -0/+91 |
|\ | |||||
| * | Fixing bug related to wiki last version | Francisco Javier López | 2018-01-09 | 4 | -0/+91 |
|/ | |||||
* | Merge branch 'improve-ssh-lookup-docs' into 'master' | Douwe Maan | 2018-01-09 | 2 | -28/+6 |
|\ | |||||
| * | Use the new gitlab-shell authorized-keys helper in documentation | Nick Thomas | 2018-01-09 | 2 | -28/+6 |
* | | Merge branch '41570-max-height-dropdown' into 'master' | Phil Hughes | 2018-01-09 | 5 | -11/+7 |
|\ \ | |/ |/| | |||||
| * | Change max-height of all dropdowns to 312px41570-max-height-dropdown | Annabel Dunstone Gray | 2018-01-08 | 5 | -11/+7 |
* | | Merge branch 'changes-dropdown-ellipsis' into 'master' | Sean McGivern | 2018-01-09 | 5 | -4/+25 |
|\ \ | |||||
| * | | Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsis | Phil Hughes | 2018-01-09 | 5 | -4/+25 |
* | | | Merge branch 'master' into 'master' | Achilleas Pipinellis | 2018-01-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix example in ci ssh_keys documentation | Vincent Lae | 2017-12-21 | 1 | -1/+1 |
* | | | | Merge branch 'docs-push-web-hook-note' into 'master' | Achilleas Pipinellis | 2018-01-09 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Add note about only 20 commits being included in push payloaddocs-push-web-hook-note | Drew Blessing | 2017-12-27 | 1 | -0/+6 |
* | | | | | Merge branch 'docs/rs-fix-changelog-header-level' into 'master' | Achilleas Pipinellis | 2018-01-09 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix the header level for the Changelog Arguments documentationdocs/rs-fix-changelog-header-level | Robert Speicher | 2017-12-28 | 1 | -1/+1 |
* | | | | | | Merge branch 'docs-19843-specify-archive-sha-options' into 'master' | Achilleas Pipinellis | 2018-01-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Specifies the accepted refs for downloading an archive via the API | Mark Fletcher | 2018-01-04 | 1 | -1/+1 |
* | | | | | | | Merge branch 'patch-24' into 'master' | Achilleas Pipinellis | 2018-01-09 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update irker documentation to mention an irker bug with key-protected channels. | Mattia Rizzolo | 2018-01-08 | 1 | -1/+5 |
* | | | | | | | | Merge branch 'fj-41681-add-param-disable-commit-stats-api' into 'master' | Douwe Maan | 2018-01-09 | 7 | -3/+63 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add option to disable commit stats to commit API | Francisco Javier López | 2018-01-09 | 7 | -3/+63 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'doc-development-architecture.md-remove-unnecessary-line' into '... | Achilleas Pipinellis | 2018-01-09 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix: remove unnecessary line | Onuwa Nnachi Isaac | 2018-01-08 | 1 | -2/+0 |
* | | | | | | | | | Merge branch 'jej/backport-authorized-keys-to-ce' into 'master' | Douwe Maan | 2018-01-09 | 18 | -14/+749 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Adds changelog for backport of authorized_keys DB lookup from EEjej/backport-authorized-keys-to-ce | James Edwards-Jones | 2018-01-08 | 1 | -0/+5 |
| * | | | | | | | | | Fix spec in shell_spec.rb | James Edwards-Jones | 2018-01-08 | 1 | -1/+1 |
| * | | | | | | | | | Fix typo in spec/requests/api/internal_spec.rb | James Edwards-Jones | 2018-01-08 | 1 | -1/+1 |
| * | | | | | | | | | Backport spec fixes in spec/lib/gitlab/shell_spec.rb | Valery Sizov | 2018-01-08 | 1 | -10/+12 |
| * | | | | | | | | | Make Gitlab::CurrentSettings available when getting settings | Sean McGivern | 2018-01-08 | 1 | -8/+8 |
| * | | | | | | | | | Avoid adding index if already exists | Paco Guzman | 2018-01-08 | 1 | -1/+2 |
| * | | | | | | | | | Backport authorized_keys_enabled defaults to true' | Michael Kozono | 2018-01-08 | 5 | -7/+289 |
| * | | | | | | | | | Use ApplicationSetting.current in Admin::ApplicationSettingsController | Rémy Coutable | 2018-01-08 | 1 | -1/+1 |
| * | | | | | | | | | Combine ssh docs and rename the doc | Ernst van Nierop | 2018-01-08 | 3 | -70/+194 |
| * | | | | | | | | | Backport option to disable writing to `authorized_keys` file | Michael Kozono | 2018-01-08 | 11 | -13/+217 |
| * | | | | | | | | | Backport authorized_keys branch 'find-key-by-fingerprint' | Pablo Carranza | 2018-01-08 | 5 | -0/+117 |
* | | | | | | | | | | Merge branch '36906_Reordering_issues_to_the_bottom' into 'master' | Phil Hughes | 2018-01-09 | 3 | -1/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixing re-ordering of an issue when dragging it to the bottom a long issue li... | David Kuri | 2018-01-09 | 3 | -1/+18 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'move-markdown-preview' into 'master' | Phil Hughes | 2018-01-09 | 3 | -184/+182 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove preview_markdown from the global obj | Jacob Schatz | 2018-01-09 | 3 | -184/+182 |
* | | | | | | | | | | | Merge branch '41404-pipelines-charts' into 'master' | Phil Hughes | 2018-01-09 | 3 | -8/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Change pipeline charts colors to match legend41404-pipelines-charts | Annabel Dunstone Gray | 2018-01-08 | 3 | -8/+16 |
* | | | | | | | | | | | | Merge branch 'check-environment-regex-ce' into 'master' | Grzegorz Bizon | 2018-01-09 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add speccheck-environment-regex-ce | Shinya Maeda | 2018-01-08 | 1 | -1/+2 |
| * | | | | | | | | | | | Merge branch 'check-environment-regex' into 'master' | Grzegorz Bizon | 2018-01-08 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'sh-store-user-in-api-logs' into 'master' | Sean McGivern | 2018-01-09 | 5 | -1/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Save user ID and username in Grape API log (api_json.log)sh-store-user-in-api-logs | Stan Hu | 2018-01-08 | 5 | -1/+38 |
* | | | | | | | | | | | | | Merge branch '41723-axios-mock-adapter' into 'master' | Phil Hughes | 2018-01-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Resolve "Install dev dependencies as devDependencies instead of dependencies" | Filipa Lacerda | 2018-01-09 | 1 | -1/+1 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'improve-table-pagination-spec' into 'master' | Jacob Schatz | 2018-01-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Improve table pagination spec | Clement Ho | 2018-01-09 | 1 | -1/+1 |
|/ / / / / / / / / / / / |