summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add cop to make sure we don't use ivar in a moduleno-ivar-in-modulesLin Jen-Shin2017-07-1214-32/+78
* Merge branch '34867-remove-net-ssh-gem' into 'master'Rémy Coutable2017-07-113-3/+4
|\
| * Remove net-ssh gemTakuya Noguchi2017-07-093-3/+4
* | Merge branch 'sh-add-mr-simple-mode' into 'master'Sean McGivern2017-07-115-5/+48
|\ \
| * | Use view=simple for simplifying merge requests APIStan Hu2017-07-113-5/+5
| * | Add a simple mode to merge request APIsh-add-mr-simple-modeStan Hu2017-07-115-5/+48
* | | Merge branch 'jej/9-4-update-license-list' into 'master'Rémy Coutable2017-07-111-260/+300
|\ \ \
| * | | Updated vendor/licenses.csv for 9.4James Edwards-Jones2017-07-111-260/+300
* | | | Merge branch 'sh-bump-sidekiq' into 'master'Robert Speicher2017-07-111-1/+1
|\ \ \ \
| * | | | Update Sidekiq from 5.0.0 to 5.0.4sh-bump-sidekiqStan Hu2017-07-101-1/+1
* | | | | Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into '...Kamil Trzciński2017-07-113-130/+169
|\ \ \ \ \
| * | | | | Do not show pipeline schedule button for non-memberTakuya Noguchi2017-07-113-130/+169
* | | | | | Merge branch 'sidebar-badge-fix-firefox' into 'master'Filipa Lacerda2017-07-111-2/+2
|\ \ \ \ \ \
| * | | | | | Fixed badge alignment in new project sidebar in FireFoxsidebar-badge-fix-firefoxPhil Hughes2017-07-111-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jej/create-update-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-12/+33
|\ \ \ \ \ \
| * | | | | | 9.4 update instractions include changes made to 9.3 instructionsJames Edwards-Jones2017-07-111-12/+33
* | | | | | | Merge branch 'fix-n-plus-one-in-url-builder' into 'master'Rémy Coutable2017-07-112-5/+7
|\ \ \ \ \ \ \
| * | | | | | | Don't reload ActiveRecord objects when building note URLsSean McGivern2017-07-112-5/+7
* | | | | | | | Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update source installation instructions for 9.4jej/update-source-install-instructions-for-9-4James Edwards-Jones2017-07-111-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jej/9-4-update-gitignore-and-license-templates' into 'master'Rémy Coutable2017-07-114-20/+25
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Update CI templates for 9.4James Edwards-Jones2017-07-114-20/+25
| |/ / / / / /
* | | | | | | Merge branch '34933-fix-welcome-page-actions-alignment' into 'master'Phil Hughes2017-07-115-92/+40
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix welcome page action items alignmentKushal Pandya2017-07-115-92/+40
|/ / / / / /
* | | | | | 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
| |/ / / / / / / /
View Lorry Controller Status