summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport MR create service changes from EEbackport-mr-create-service-changesSean McGivern2017-07-121-2/+1
* Merge branch 'revert-d7bbafd8' into 'master'Sean McGivern2017-07-113-6/+6
|\
| * Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'"Rémy Coutable2017-07-113-6/+6
* | Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
|\ \ | |/ |/|
| * Disabled prepared statements in testsh-disabled-prepared-statements-in-testStan Hu2017-07-102-0/+2
* | Merge branch '34911-balance-spinach-jobs-to-rspec' into 'master'Grzegorz Bizon2017-07-111-63/+63
|\ \
| * | Reduce parallelization of Spinach jobs and increase the RSpec ones34911-balance-spinach-jobs-to-rspecRémy Coutable2017-07-101-63/+63
* | | Merge branch 'rs-warm-capybara-only-in-ci' into 'master'Rémy Coutable2017-07-111-0/+1
|\ \ \
| * | | Don't attempt to warm the Capybara cache outside of CIrs-warm-capybara-only-in-ciRobert Speicher2017-07-101-0/+1
* | | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-1113-90/+228
|\ \ \ \
| * | | | Differentiate shared test context using options hash instead of subject.33949-remove-healthcheck-access-tokenPawel Chojnacki2017-07-103-7/+9
| * | | | Add tests for token auth.Pawel Chojnacki2017-07-063-20/+63
| * | | | Limit docs line lenghtPawel Chojnacki2017-07-061-3/+4
| * | | | Merge prometheus unicorn sampler settigns within monitoring settingsPawel Chojnacki2017-07-053-11/+4
| * | | | Add spaces between test phasesPawel Chojnacki2017-07-053-3/+20
| * | | | Finish refactring processed configuraiton, and add test validating ip range m...Pawel Chojnacki2017-07-052-10/+24
| * | | | Add Changelog entryPawel Chojnacki2017-07-051-0/+4
| * | | | correctly handle transforming settings into useful datastructurePawel Chojnacki2017-07-052-2/+5
| * | | | Bring back healthcheck token access to monitoring resources, but mark this as...Pawel Chojnacki2017-07-054-8/+47
| * | | | Remove the need to use health check tokenPawel Chojnacki2017-07-0510-65/+87
* | | | | Merge branch '34909-pipeline-dropdown-z-index' into 'master'Filipa Lacerda2017-07-111-1/+1
|\ \ \ \ \
| * | | | | Increase z index of mini pipeline dropdown34909-pipeline-dropdown-z-indexAnnabel Dunstone Gray2017-07-101-1/+1
* | | | | | Merge branch 'sh-improve-mr-api' into 'master'Sean McGivern2017-07-111-4/+4
|\ \ \ \ \ \
| * | | | | | Fix sort ordering with merge request APIsh-improve-mr-apiStan Hu2017-07-101-4/+3
| * | | | | | Paginate the merge requests API earlier to avoid eager loading every merge re...Stan Hu2017-07-101-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sh-fix-award-emoji-spec' into 'master'Rémy Coutable2017-07-111-2/+2
|\ \ \ \ \ \
| * | | | | | Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`sh-fix-award-emoji-specStan Hu2017-07-101-2/+2
| |/ / / / /
* | | | | | Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'Rémy Coutable2017-07-113-6/+6
|\ \ \ \ \ \
| * | | | | | Bump knapsack to 1.14.0Takuya Noguchi2017-07-113-6/+6
* | | | | | | Merge branch '34928_techguru_undo_regression' into 'master'Stan Hu2017-07-114-3/+62
|\ \ \ \ \ \ \
| * | | | | | | Repair Regression caused by - !11573Paul Charlton2017-07-114-3/+62
|/ / / / / / /
* | | | | | | Merge branch '30392_support_for_multiple_key_value_stores' into 'master'Robert Speicher2017-07-11118-450/+1158
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Support multiple Redis instances based on queue typePaul Charlton2017-07-11118-450/+1158
|/ / / / / /
* | | | | | Merge branch 'catch-redis-address-error' into 'master'Stan Hu2017-07-102-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'master' into 'catch-redis-address-error'DJ Mountney2017-07-101685-12592/+31320
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'fix_milestone_destroy_service' into 'master'Mike Greiling2017-07-102-2/+55
|\ \ \ \ \ \
| * | | | | | Fix milestones destroy servicefix_milestone_destroy_serviceFelipe Artur2017-07-102-2/+55
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'document-gitlab-shell-disable-gems' into 'master'Stan Hu2017-07-101-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | doc:installation add note about disable-gems for gitlab-shellJason Plum2017-07-101-0/+6
|/ / / / /
* | | | | Merge branch 'revert_bootsnap' into 'master'Robert Speicher2017-07-104-15/+0
|\ \ \ \ \
| * | | | | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"Marin Jankovski2017-07-104-15/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-107-41/+145
|\ \ \ \ \
| * | | | | Add spec for IssuableMetadata modulesh-optimize-mr-api-emojis-and-labelsStan Hu2017-07-081-0/+59
| * | | | | Add spec for N+1 queriesStan Hu2017-07-081-0/+12
| * | | | | Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-086-41/+74
| | |_|/ / | |/| | |
* | | | | Merge branch '34728-fix-application-setting-created-when-redis-down' into 'ma...Stan Hu2017-07-105-8/+35
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Prevent bad data being added to application settings when Redis is unavailableNick Thomas2017-07-105-8/+35
* | | | | Merge branch '34891-follow-up-feature-group' into 'master'Sean McGivern2017-07-102-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Re-add Feature.register_feature_groups which is already documentedRémy Coutable2017-07-102-0/+8
|/ / / /
* | | | Merge branch 'fix/gb/qa/configure-headless-chrome-screenshots' into 'master'Rémy Coutable2017-07-101-0/+4
|\ \ \ \
View Lorry Controller Status