Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | Add a simple mode to merge request APIsh-add-mr-simple-mode | Stan Hu | 2017-07-11 | 5 | -5/+48 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'jej/9-4-update-license-list' into 'master' | Rémy Coutable | 2017-07-11 | 1 | -260/+300 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Updated vendor/licenses.csv for 9.4 | James Edwards-Jones | 2017-07-11 | 1 | -260/+300 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sh-bump-sidekiq' into 'master' | Robert Speicher | 2017-07-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update Sidekiq from 5.0.0 to 5.0.4sh-bump-sidekiq | Stan Hu | 2017-07-10 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into '... | Kamil Trzciński | 2017-07-11 | 3 | -130/+169 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Do not show pipeline schedule button for non-member | Takuya Noguchi | 2017-07-11 | 3 | -130/+169 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'sidebar-badge-fix-firefox' into 'master' | Filipa Lacerda | 2017-07-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fixed badge alignment in new project sidebar in FireFoxsidebar-badge-fix-firefox | Phil Hughes | 2017-07-11 | 1 | -2/+2 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jej/create-update-instructions-for-9-4' into 'master' | Achilleas Pipinellis | 2017-07-11 | 1 | -12/+33 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | 9.4 update instractions include changes made to 9.3 instructions | James Edwards-Jones | 2017-07-11 | 1 | -12/+33 | |
* | | | | | | | | | | | Merge branch 'fix-n-plus-one-in-url-builder' into 'master' | Rémy Coutable | 2017-07-11 | 2 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Don't reload ActiveRecord objects when building note URLs | Sean McGivern | 2017-07-11 | 2 | -5/+7 | |
* | | | | | | | | | | | | Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master' | Achilleas Pipinellis | 2017-07-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Update source installation instructions for 9.4jej/update-source-install-instructions-for-9-4 | James Edwards-Jones | 2017-07-11 | 1 | -2/+2 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jej/9-4-update-gitignore-and-license-templates' into 'master' | Rémy Coutable | 2017-07-11 | 4 | -20/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Update CI templates for 9.4 | James Edwards-Jones | 2017-07-11 | 4 | -20/+25 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '34933-fix-welcome-page-actions-alignment' into 'master' | Phil Hughes | 2017-07-11 | 5 | -92/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix welcome page action items alignment | Kushal Pandya | 2017-07-11 | 5 | -92/+40 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'revert-d7bbafd8' into 'master' | Sean McGivern | 2017-07-11 | 3 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'" | Rémy Coutable | 2017-07-11 | 3 | -6/+6 | |
* | | | | | | | | | | | Merge branch 'sh-disabled-prepared-statements-in-test' into 'master' | Yorick Peterse | 2017-07-11 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Disabled prepared statements in testsh-disabled-prepared-statements-in-test | Stan Hu | 2017-07-10 | 2 | -0/+2 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch '34911-balance-spinach-jobs-to-rspec' into 'master' | Grzegorz Bizon | 2017-07-11 | 1 | -63/+63 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Reduce parallelization of Spinach jobs and increase the RSpec ones34911-balance-spinach-jobs-to-rspec | Rémy Coutable | 2017-07-10 | 1 | -63/+63 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'rs-warm-capybara-only-in-ci' into 'master' | Rémy Coutable | 2017-07-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Don't attempt to warm the Capybara cache outside of CIrs-warm-capybara-only-in-ci | Robert Speicher | 2017-07-10 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge branch '33949-remove-healthcheck-access-token' into 'master' | Sean McGivern | 2017-07-11 | 13 | -90/+228 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Differentiate shared test context using options hash instead of subject.33949-remove-healthcheck-access-token | Pawel Chojnacki | 2017-07-10 | 3 | -7/+9 | |
| * | | | | | | | | | | Add tests for token auth. | Pawel Chojnacki | 2017-07-06 | 3 | -20/+63 | |
| * | | | | | | | | | | Limit docs line lenght | Pawel Chojnacki | 2017-07-06 | 1 | -3/+4 | |
| * | | | | | | | | | | Merge prometheus unicorn sampler settigns within monitoring settings | Pawel Chojnacki | 2017-07-05 | 3 | -11/+4 | |
| * | | | | | | | | | | Add spaces between test phases | Pawel Chojnacki | 2017-07-05 | 3 | -3/+20 | |
| * | | | | | | | | | | Finish refactring processed configuraiton, and add test validating ip range m... | Pawel Chojnacki | 2017-07-05 | 2 | -10/+24 | |
| * | | | | | | | | | | Add Changelog entry | Pawel Chojnacki | 2017-07-05 | 1 | -0/+4 | |
| * | | | | | | | | | | correctly handle transforming settings into useful datastructure | Pawel Chojnacki | 2017-07-05 | 2 | -2/+5 | |
| * | | | | | | | | | | Bring back healthcheck token access to monitoring resources, but mark this as... | Pawel Chojnacki | 2017-07-05 | 4 | -8/+47 | |
| * | | | | | | | | | | Remove the need to use health check token | Pawel Chojnacki | 2017-07-05 | 10 | -65/+87 | |
* | | | | | | | | | | | Merge branch '34909-pipeline-dropdown-z-index' into 'master' | Filipa Lacerda | 2017-07-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Increase z index of mini pipeline dropdown34909-pipeline-dropdown-z-index | Annabel Dunstone Gray | 2017-07-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'sh-improve-mr-api' into 'master' | Sean McGivern | 2017-07-11 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix sort ordering with merge request APIsh-improve-mr-api | Stan Hu | 2017-07-10 | 1 | -4/+3 | |
| * | | | | | | | | | | | | Paginate the merge requests API earlier to avoid eager loading every merge re... | Stan Hu | 2017-07-10 | 1 | -1/+2 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'sh-fix-award-emoji-spec' into 'master' | Rémy Coutable | 2017-07-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`sh-fix-award-emoji-spec | Stan Hu | 2017-07-10 | 1 | -2/+2 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch '34902-bump-knapsack-to-1-14-0' into 'master' | Rémy Coutable | 2017-07-11 | 3 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Bump knapsack to 1.14.0 | Takuya Noguchi | 2017-07-11 | 3 | -6/+6 | |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '34928_techguru_undo_regression' into 'master' | Stan Hu | 2017-07-11 | 4 | -3/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Repair Regression caused by - !11573 | Paul Charlton | 2017-07-11 | 4 | -3/+62 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '30392_support_for_multiple_key_value_stores' into 'master' | Robert Speicher | 2017-07-11 | 118 | -450/+1158 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | |