summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Banzai - avoid redis if attr is in DB cachebanzai-avoid-redis-if-db-cacheMario de la Ossa2019-07-1012-48/+194
* Merge branch 'qa/improve-performance-of-plan-issue-e2e-test' into 'master'Dan Davison2019-07-033-18/+29
|\
| * Backport EE MR that improves end-to-end testsWalmyr Lima2019-07-033-18/+29
* | Merge branch 'limit-amount-of-tests-returned' into 'master'Stan Hu2019-07-0311-88/+189
|\ \
| * | Limit amount of JUnit tests returnedKamil Trzciński2019-07-0311-88/+189
* | | Merge branch 'docs-rename-release-group-labels' into 'master'Mek Stittri2019-07-031-2/+2
|\ \ \
| * | | Rename Release groups in issue_workflow.mddocs-rename-release-group-labelsRémy Coutable2019-07-031-2/+2
* | | | Merge branch '22991-fix-sidekiq-testing-inline' into 'master'Mayra Cabrera2019-07-031-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Change occurrence of Sidekiq::Testing.inline!Reuben Pereira2019-07-031-1/+1
|/ / /
* | | Merge branch 'sh-fix-appearance-spec-failure' into 'master'Douglas Barbosa Alexandre2019-07-032-3/+2
|\ \ \
| * | | Fix order-dependent spec failure in appearance_spec.rbStan Hu2019-07-032-3/+2
|/ / /
* | | Merge branch 'add-commit-signatures-feature-flag' into 'master'Felipe Artur2019-07-031-1/+6
|\ \ \
| * | | Add GetCommitSignatures feature flagadd-commit-signatures-feature-flagFelipe Artur2019-06-281-1/+6
* | | | Merge branch 'id-fix-appearance-spec' into 'master'Bob Van Landuyt2019-07-031-1/+1
|\ \ \ \
| * | | | Put a failed example from appearance_spec in quarantineIgor2019-07-031-1/+1
|/ / / /
* | | | Merge branch 'cache-performance_bar_allowed_user_ids-locally' into 'master'Stan Hu2019-07-032-9/+46
|\ \ \ \
| * | | | Cache PerformanceBar.allowed_user_ids list locally and in RedisRémy Coutable2019-07-032-9/+46
|/ / / /
* | | | Merge branch '61005-grafanaInAdminSettingsMonitoringMenu' into 'master'Rémy Coutable2019-07-0311-0/+113
|\ \ \ \
| * | | | Add Grafana to Admin > Monitoring menu when enabledManeschi Romain2019-07-0311-0/+113
|/ / / /
* | | | Merge branch 'add-salesforce-logo' into 'master'Dmitriy Zaporozhets2019-07-033-1/+6
|\ \ \ \
| * | | | Add changelog entryadd-salesforce-logoMałgorzata Ksionek2019-07-031-0/+5
| * | | | Add salesforce logoMałgorzata Ksionek2019-07-032-1/+1
* | | | | Merge branch 'docs/api-single-codebase' into 'master'Marcia Ramos2019-07-032-7/+48
|\ \ \ \ \
| * | | | | Re-align CE and EE API docsdocs/api-single-codebaseAchilleas Pipinellis2019-07-032-7/+48
* | | | | | Merge branch 'do-not-save-peek-request-for-unauthenticated-users' into 'master'61056-data-improvements-for-contribution-analyticsSean McGivern2019-07-032-0/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Only save Peek session in Redis when Peek is enabledRémy Coutable2019-07-032-0/+15
* | | | | | Merge branch '61797-error-tracking-jest' into 'master'Kushal Pandya2019-07-038-7/+10
|\ \ \ \ \ \
| * | | | | | Move error_tracking_frontend specs to JestSimon Knox2019-07-038-7/+10
|/ / / / / /
* | | | | | Merge branch '55487-enable-group-terminals-button' into 'master'Fatih Acet2019-07-033-37/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enable terminals button for group clusters55487-enable-group-terminals-buttonTiger2019-07-023-37/+19
* | | | | | Merge branch 'winh-jest-markdown-header' into 'master'Paul Slaughter2019-07-032-9/+10
|\ \ \ \ \ \
| * | | | | | Migrate markdown header_spec.js to JestWinnie Hellmann2019-07-032-9/+10
|/ / / / / /
* | | | | | Merge branch 'asciidoc-syntax-highlighting' into 'master'Douwe Maan2019-07-036-3/+91
|\ \ \ \ \ \
| * | | | | | Enable AsciiDoc syntax highlighting (using Rouge)Guillaume Grossetie2019-07-026-3/+91
* | | | | | | Merge branch 'fix-todo-allow_collaboration' into 'master'Dmitriy Zaporozhets2019-07-031-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Update TODO: allow_collaboration column renamingfix-todo-allow_collaborationMark Chao2019-07-031-0/+1
* | | | | | | | Merge branch 'issue/55953' into 'master'Sean McGivern2019-07-0333-240/+247
|\ \ \ \ \ \ \ \
| * | | | | | | | Update locale.potSean McGivern2019-07-031-9/+3
| * | | | | | | | Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953Sean McGivern2019-07-031083-24394/+6442
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/issue/55953' into issue/55953Michel Engelen2019-07-021-0/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | updated localeMichel Engelen2019-07-021-6/+0
| | * | | | | | | | | replaced `discussion` with `thread` in comment buttonMichel Engelen2019-07-021-4/+4
| | * | | | | | | | | updated tests to comply with the corresponding EE branchMichel Engelen2019-06-265-9/+9
| | * | | | | | | | | updated localeMichel Engelen2019-06-141-9/+9
| | * | | | | | | | | prettified noteable_discussion spec fileMichel Engelen2019-06-141-6/+4
| | * | | | | | | | | fixed remaining specs for !29553Michel Engelen2019-06-142-3/+3
| | * | | | | | | | | prettified js testfile for noteable_discussion componentMichel Engelen2019-06-141-3/+3
| | * | | | | | | | | updated testMichel Engelen2019-06-141-8/+8
| | * | | | | | | | | updated karma test for noteable_discussion componentMichel Engelen2019-06-141-1/+1
| | * | | | | | | | | prettified noteable_discussion component and updated testsMichel Engelen2019-06-142-21/+19