summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelog entrygitaly-version-v1.50.0GitalyBot2019-06-281-0/+5
* Update Gitaly version to v1.50.0GitalyBot2019-06-281-1/+1
* Merge branch '63874-use-process-cpu-time-instead-of-thread-for-cpu-metrics' i...Stan Hu2019-06-282-13/+5
|\
| * Fix spec definitions63874-use-process-cpu-time-instead-of-thread-for-cpu-metricsAleksei Lipniagov2019-06-281-2/+2
| * Use PROCESS_CPUTIME_ID for cpu time metricsAleksei Lipniagov2019-06-281-11/+3
* | Merge branch 'vue-i18n-js-boards-directory' into 'master'Mike Greiling2019-06-2811-57/+138
|\ \
| * | Vue-i18n: javascripts/boards directoryEzekiel Kigbo2019-06-2811-57/+138
|/ /
* | Merge branch 'leipert-absolute-scss-paths' into 'master'Mike Greiling2019-06-2811-186/+100
|\ \
| * | Fix modal related testsPaul Gascou-Vaillancourt2019-06-282-25/+12
| * | Fix selector in karma specLukas Eipert2019-06-281-1/+1
| * | Set logModifiedComponents in jest and karmaPaul Slaughter2019-06-282-0/+17
| * | Use absolute paths for SCSS importsLukas Eipert2019-06-286-160/+70
* | | Merge branch 'revert-423c4c43' into 'master'62722-boot-app-in-ci-and-check-memory-v2Rémy Coutable2019-06-284-40/+5
|\ \ \
| * | | Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'"Rémy Coutable2019-06-284-40/+5
|/ / /
* | | Merge branch '10087-settings-pannel' into 'master'63463-follow-up-from-insights-is-now-ga62296-conform-on-single-icon-for-dropdown-buttons-which-align-with-design-systemPhil Hughes2019-06-282-27/+55
|\ \ \
| * | | Moves EE code into a mixin10087-settings-pannelFilipa Lacerda2019-06-282-27/+55
* | | | Merge branch 'last-commit-widget-api-call' into 'master'Filipa Lacerda2019-06-289-100/+120
|\ \ \ \
| * | | | Use GraphQL API to fetch last commit data for treePhil Hughes2019-06-289-100/+120
* | | | | Merge branch 'transaction-metrics' into 'master'Lin Jen-Shin2019-06-284-0/+42
|\ \ \ \ \
| * | | | | Adds metrics to measure database transactionstransaction-metricsAndrew Newdigate2019-06-284-0/+42
* | | | | | Merge branch 'qa-staging-59-fix-project-template-spec-ce' into 'master'Lin Jen-Shin2019-06-281-1/+1
|\ \ \ \ \ \
| * | | | | | Use 'has_css?' because 'first' does not return booleanqa-staging-59-fix-project-template-spec-ceSanad Liaquat2019-06-281-1/+1
* | | | | | | Merge branch 'docs-update-subject-label-issue-workflow' into 'master'Rémy Coutable2019-06-281-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Update issue workflow for subject labelsdocs-update-subject-label-issue-workflowMark Fletcher2019-06-281-0/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'update-prometheus-client-mmap' into 'master'Stan Hu2019-06-282-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update prometheus-client-mmap to 0.9.6update-prometheus-client-mmapKamil Trzciński2019-06-282-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'small-s-in-elasticsearch-in-code' into 'master'Rémy Coutable2019-06-283-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in code comments about ElasticsearchTakuya Noguchi2019-06-283-2/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '63479-jira-capitalization' into 'master'Rémy Coutable2019-06-2876-236/+241
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Replace 'JIRA' with 'Jira'Takuya Noguchi2019-06-2876-236/+241
|/ / / / / /
* | | | | | Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'Kamil Trzciński2019-06-284-5/+40
|\ \ \ \ \ \
| * | | | | | Get memory data after booting app in production62722-boot-app-in-ci-and-check-memoryAleksei Lipniagov2019-06-284-5/+40
* | | | | | | Merge branch 'awgeorge1/gitlab-ee-6249-related-quick-action-docs' into 'master'Bob Van Landuyt2019-06-281-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Backport docs about /relate quick actionawgeorge1/gitlab-ee-6249-related-quick-action-docsToon Claes2019-06-271-0/+1
* | | | | | | Merge branch 'ee-issue/11039' into 'master'Filipa Lacerda2019-06-282-0/+6
|\ \ \ \ \ \ \
| * | | | | | | added code difference in `app/views/search/_category.html.haml` from EE to CEMichel Engelen2019-06-282-0/+6
|/ / / / / / /
* | | | | | | Merge branch '3264-project-aliases-ce' into 'master'Bob Van Landuyt2019-06-287-0/+162
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add @patrickbajao as codeowner of project aliases3264-project-aliases-cePatrick Bajao2019-06-271-0/+2
| * | | | | | Specify feature was added in GitLab PremiumPatrick Bajao2019-06-262-2/+2
| * | | | | | Add project_aliases to be imported/exportedPatrick Bajao2019-06-261-0/+1
| * | | | | | Update related documentationPatrick Bajao2019-06-263-16/+35
| * | | | | | Add documentation for feature and APIPatrick Bajao2019-06-262-0/+114
| * | | | | | Create project_aliases tablePatrick Bajao2019-06-262-0/+26
* | | | | | | Merge branch 'set-higher-ttl-for-trace-write' into 'master'Kamil Trzciński2019-06-283-2/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Set higher TTL to write lock for tracesset-higher-ttl-for-trace-writeShinya Maeda2019-06-283-2/+7
* | | | | | | Merge branch 'docs/secure-maintenance' into 'master'Marcia Ramos2019-06-285-5/+48
|\ \ \ \ \ \ \
| * | | | | | | Document the security tools maintenance and vulnerabilities DB updatedocs/secure-maintenanceAchilleas Pipinellis2019-06-265-5/+48
* | | | | | | | Merge branch 'sh-support-subnets-ip-rate-limiter' into 'master'Thong Kuah2019-06-285-3/+94
|\ \ \ \ \ \ \ \
| * | | | | | | | Support CIDR notation in IP rate limitersh-support-subnets-ip-rate-limiterStan Hu2019-06-275-3/+94
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'graphql-tree-last-commit' into 'master'Lin Jen-Shin2019-06-2812-3/+139
|\ \ \ \ \ \ \ \