summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* CE port: Move EE differences for `app/views/admin/users/show.html.haml`ce-6099-move-ee-differences-for-app-views-admin-users-show-html-hamlDennis Tang2019-04-092-1/+8
* Merge branch 'fix-pull-request-importer' into 'master'Kamil Trzciński2019-04-083-1/+79
|\
| * Improve performance of PR importfix-pull-request-importerKamil Trzciński2019-04-083-1/+79
* | Merge branch '15463-extract-hooks-service' into 'master'Robert Speicher2019-04-0814-659/+879
|\ \
| * | Extract a Git::{Base,Tag,Branch}HooksServiceNick Thomas2019-04-0514-659/+879
* | | Merge branch 'bgamari/gitlab-ce-T53279b' into 'master'Rémy Coutable2019-04-089-10/+67
|\ \ \
| * | | Fix `updated_at` doesn't apply to `state_event` updates of issues via APISean McGivern2019-04-089-10/+67
|/ / /
* | | Merge branch 'mw-i18n-flashes' into 'master'Sean McGivern2019-04-0814-34/+133
|\ \ \
| * | | Externalize strings in flash messagesMartin Wortschack2019-04-0814-34/+133
|/ / /
* | | Merge branch 'document-approach-for-handling-big-repositories' into 'master'Achilleas Pipinellis2019-04-082-0/+236
|\ \ \
| * | | Add usefull tips about big repositoriesdocument-approach-for-handling-big-repositoriesKamil Trzciński2019-04-082-0/+236
* | | | Merge branch '10938-fix-styleline' into 'master'Phil Hughes2019-04-081-1/+1
|\ \ \ \
| * | | | Adds EE folder in the stylelint command10938-fix-stylelineFilipa Lacerda2019-04-051-1/+1
* | | | | Merge branch 'instance-configuration-artifact-size' into 'master'Rémy Coutable2019-04-083-1/+13
|\ \ \ \ \
| * | | | | Display maximum artifact size from runtime configBastian Blank2019-04-033-1/+13
* | | | | | Merge branch 'docs-anchors-18' into 'master'Achilleas Pipinellis2019-04-0817-34/+26
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Docs: Fix anchors related to variables docMarcel Amirault2019-04-0817-34/+26
|/ / / / /
* | | | | Merge branch 'docs-update-rspec-set-usage' into 'master'Rémy Coutable2019-04-081-2/+4
|\ \ \ \ \
| * | | | | Add doc when rspec-set won't workdocs-update-rspec-set-usageHeinrich Lee Yu2019-04-051-2/+4
* | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Fatih Acet2019-04-082-5/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update dependency @gitlab/svgs to ^1.59.0Lukas 'Eipi' Eipert2019-04-082-5/+5
* | | | | | Merge branch 'docs/ci-regexp-syntax' into 'master'Kamil Trzciński2019-04-081-1/+1
|\ \ \ \ \ \
| * | | | | | Update RegExp syntax link to RE2Cody Mize2019-04-081-1/+1
|/ / / / / /
* | | | | | Merge branch '60035-weight-trainee-maintainers-higher-in-reviewer-roulette' i...Rémy Coutable2019-04-081-2/+4
|\ \ \ \ \ \
| * | | | | | Make trainee maintainers three times as likely to be picked60035-weight-trainee-maintainers-higher-in-reviewer-rouletteSean McGivern2019-04-051-2/+4
* | | | | | | Merge branch '59570-create-merge-request-quick-action' into 'master'Sean McGivern2019-04-082-59/+56
|\ \ \ \ \ \ \
| * | | | | | | Extract create merge request quick action spec59570-create-merge-request-quick-actionAlexandru Croitor2019-04-082-59/+56
|/ / / / / / /
* | | | | | | Merge branch '59570-wip-quick-action' into 'master'Sean McGivern2019-04-082-47/+44
|\ \ \ \ \ \ \
| * | | | | | | Extract wip quick action to a shared example59570-wip-quick-actionAlexandru Croitor2019-04-052-47/+44
* | | | | | | | Merge branch '59570-duplicate-quick-action' into 'master'Sean McGivern2019-04-082-36/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Extract duplicate quick action spec to a shared example59570-duplicate-quick-actionAlexandru Croitor2019-04-052-36/+35
* | | | | | | | | Merge branch '60006-add-touch-for-image-diff' into 'master'Phil Hughes2019-04-084-21/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix touch event pageXftab2019-04-084-21/+57
|/ / / / / / / / /
* | | | | | | | | Merge branch '58981-migrate-clusters-tests-to-jest' into 'master'Phil Hughes2019-04-087-41/+62
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Migrate clusters tests to jestEnrique Alcántara2019-04-087-41/+62
|/ / / / / / / / /
* | | | | | | | | Merge branch '60116-fix-button-wrapping' into 'master'Phil Hughes2019-04-082-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix button text wrapping to next line60116-fix-button-wrappingAnnabel Dunstone Gray2019-04-052-0/+6
* | | | | | | | | | Merge branch 'sh-add-gitaly-ref-name-caching-tree-controller' into 'master'James Lopez2019-04-083-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable Gitaly FindCommit caching for TreeControllersh-add-gitaly-ref-name-caching-tree-controllerStan Hu2019-04-073-0/+9
* | | | | | | | | | | Merge branch 'ce-proj-settings-ok-mr-settings-only' into 'master'Fatih Acet2019-04-086-36/+77
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Improve project merge request settingsce-proj-settings-ok-mr-settings-onlyLuke Bennett2019-04-076-36/+77
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Kushal Pandya2019-04-082-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update dependency @gitlab/ui to ^3.2.0Lukas 'Eipi' Eipert2019-04-052-5/+5
* | | | | | | | | | | Merge branch 'fix-karma-test-utils-master-overflow' into 'master'Kushal Pandya2019-04-0813-9/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Disable sync mode for serverless testsfix-karma-test-utils-master-overflowLuke Bennett2019-04-076-1/+9
| * | | | | | | | | | | Fix unmocked requests in serverless testsLuke Bennett2019-04-074-8/+16
| * | | | | | | | | | | Move karma serverless tests to jest for isolationLuke Bennett2019-04-0713-0/+0
* | | | | | | | | | | | Merge branch 'docs-anchors-20-misc' into 'master'Evan Read2019-04-083-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Docs: Fix misc anchorsMarcel Amirault2019-04-083-4/+4
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs-anchors-19-environments' into 'master'Evan Read2019-04-087-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \