summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change occurrence of Sidekiq::Testing.inline!22991-fix-sidekiq-testing-inlinerpereira22019-07-031-1/+1
* 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
| | * | | | | | | updated tests for !29553Michel Engelen2019-06-142-10/+10
| | * | | | | | | updated tests for !29553Michel Engelen2019-06-141-1/+1
| | * | | | | | | updated tests for !29553Michel Engelen2019-06-141-1/+1
| | * | | | | | | replaced string `discussion` with `thread` in issuable-form templateMichel Engelen2019-06-141-3/+3
| | * | | | | | | replaced string `discussion` wit `thread` in noteable-discussion componentMichel Engelen2019-06-141-6/+6
| | * | | | | | | replaced string `discussion` wit `thread` in comment-button templateMichel Engelen2019-06-141-2/+2
| | * | | | | | | replaced string `discussion` wit `thread` in discussion templateMichel Engelen2019-06-141-1/+1
| | * | | | | | | replaced string `discussion` wit `thread` in note-form componentMichel Engelen2019-06-141-2/+2
| | * | | | | | | updated Karma test for changed strings in mr-widget stateMichel Engelen2019-06-131-4/+4
| | * | | | | | | updated localizationMichel Engelen2019-06-131-4/+4