summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update specs: prod/dev environment examples64972-fix-unicorn-workers-metricAleksei Lipniagov2019-07-252-14/+41
* Fix pid discovery for Unicorn in PidProviderAleksei Lipniagov2019-07-253-14/+36
* Merge branch '9643-jira-api-serializer-ce' into 'master'Sean McGivern2019-07-252-1/+7
|\
| * Backport Jira issue key regexHeinrich Lee Yu2019-07-252-1/+7
* | Merge branch 'tc-revert-rails5-workaround' into 'master'Andreas Brandl2019-07-251-5/+1
|\ \
| * | Revert "Workaround for Rails 5, where LIMIT..."tc-revert-rails5-workaroundToon Claes2019-07-161-5/+1
* | | Merge branch 'add-caching-to-archive-endpoint' into 'master'Grzegorz Bizon2019-07-254-7/+108
|\ \ \
| * | | Return an ETag headers for the archive endpointadd-caching-to-archive-endpointAhmad Sherif2019-07-234-7/+108
* | | | Merge branch 'rs-spec-parity' into 'master'Lin Jen-Shin2019-07-255-4/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Copy private_access_spec from EErs-spec-parityRobert Speicher2019-07-241-1/+1
| * | | Copy dashboard fixture schema from EERobert Speicher2019-07-241-1/+5
| * | | CE-EE parity for spec/viewsRobert Speicher2019-07-242-0/+2
| * | | CE-EE parity for interpret_service_specRobert Speicher2019-07-241-2/+2
* | | | Merge branch 'make-relative-positioning-module-reusable' into 'master'Bob Van Landuyt2019-07-255-261/+300
|\ \ \ \
| * | | | Make RelativePositioning reusablemake-relative-positioning-module-reusableAdam Hegyi2019-07-245-261/+300
* | | | | Merge branch 'sl-qa-staging-63-spam-issue-fix-ce' into 'master'Sanad Liaquat2019-07-252-3/+5
|\ \ \ \ \
| * | | | | Adds visibility attr to projectsl-qa-staging-63-spam-issue-fix-ceSanad Liaquat2019-07-222-3/+5
* | | | | | Merge branch 'docs-scim-updates' into 'master'Evan Read2019-07-254-21/+30
|\ \ \ \ \ \
| * | | | | | Docs: Improve SCIM documentationTristan Williams2019-07-254-21/+30
|/ / / / / /
* | | | | | Merge branch 'sh-yarn-dedupe-docs' into 'master'Mike Greiling2019-07-251-0/+12
|\ \ \ \ \ \
| * | | | | | Add documentation on how to add dependencies to yarnsh-yarn-dedupe-docsStan Hu2019-07-231-0/+12
* | | | | | | Merge branch 'patch-72' into 'master'Evan Read2019-07-251-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix rendering in Newline sectionEric Lindsey2019-07-251-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'sh-rubocop-reverse-each' into 'master'Douglas Barbosa Alexandre2019-07-254-11/+3
|\ \ \ \ \ \ \
| * | | | | | | Enable Rubocop Performance/ReverseEachsh-rubocop-reverse-eachStan Hu2019-07-244-11/+3
* | | | | | | | Merge branch 'unnececssary-slack-redirect' into 'master'Evan Read2019-07-241-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed the unnecessary loop through `../project_services/slack.md`.Jeffrey Cafferata2019-07-221-2/+2
* | | | | | | | | Merge branch 'docs-markdown-whitespace' into 'master'Evan Read2019-07-241-28/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add whitespace back to markdown docMarcel Amirault2019-07-241-28/+34
|/ / / / / / / / /
* | | | | | | | | Merge branch '12250-mvc-security-navigation-section-docs' into 'master'Evan Read2019-07-245-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update docs to reflect new Security tabs12250-mvc-security-navigation-section-docsDave Pisek2019-07-245-3/+3
* | | | | | | | | | Merge branch '64746-Commit-authors-avatar-sretched-in-commit-view-if-no-image...Paul Slaughter2019-07-242-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Changed `author_avatar` to inline-block classMarc Schwede2019-07-242-1/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '64763-fix-tags-page-layout' into 'master'Fatih Acet2019-07-242-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix tags page layoutAndré Luís2019-07-242-1/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch 'sh-enable-rubocop-hash-search' into 'master'Mayra Cabrera2019-07-245-15/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Enable Rubocop Performance/InefficientHashSearchsh-enable-rubocop-hash-searchStan Hu2019-07-245-15/+4
* | | | | | | | | Merge branch 'ce-docker_image_replication-event-generation' into 'master'Douglas Barbosa Alexandre2019-07-247-0/+83
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597ce-docker_image_replication-event-generationValery Sizov2019-07-247-0/+83
* | | | | | | | | | Merge branch '48717-rate-limit-raw-controller-show' into 'master'Stan Hu2019-07-2412-17/+291
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add RateLimiter to RawControllerMayra Cabrera2019-07-2412-17/+291
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '63730-fix-500-status-labels-pd' into 'master'Robert Speicher2019-07-243-1/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add where condition to filter out invalid labels with nil type63730-fix-500-status-labels-pdPatrick Derichs2019-07-243-1/+19
* | | | | | | | | | | Merge branch 'cleanup/spec-tasks' into 'master'Douwe Maan2019-07-243-62/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolves confusion within spec rake taskscleanup/spec-tasksJeremy Jackson2019-07-233-62/+6
* | | | | | | | | | | | Merge branch '62217-follow-up-from-fix-display-of-promote-to-group-label' int...Douwe Maan2019-07-243-26/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove project from show_label_issuables_link?62217-follow-up-from-fix-display-of-promote-to-group-labelHeinrich Lee Yu2019-07-233-26/+7
* | | | | | | | | | | | | Merge branch 'update-author-prefix-on-merge-request-notification' into 'master'Douwe Maan2019-07-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update author prefix on merge request notificationGeorge Tsiolis2019-07-231-1/+1
* | | | | | | | | | | | | | Merge branch '62128-remove-ignore-rule-for-project-auto-devops-domain' into '...Douwe Maan2019-07-242-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |