summaryrefslogtreecommitdiff
Commit message (Collapse)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 gem Closes #34867 See merge request !12736
| * Remove net-ssh gemTakuya Noguchi2017-07-093-3/+4
| |
* | Merge branch 'sh-add-mr-simple-mode' into 'master'Sean McGivern2017-07-115-5/+48
|\ \ | | | | | | | | | | | | | | | | | | Add a simple mode to merge request API Closes #34920 See merge request !12766
| * | 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
| | | | | | | | | | | | | | | | | | | | | The current "basic" merge request API still loads too much data. For integrations like the Trello Power-up, we just need the basics. Closes #34920
* | | Merge branch 'jej/9-4-update-license-list' into 'master'Rémy Coutable2017-07-111-260/+300
|\ \ \ | | | | | | | | | | | | | | | | Updated vendor/licenses.csv for 9.4 See merge request !12788
| * | | Updated vendor/licenses.csv for 9.4James Edwards-Jones2017-07-111-260/+300
| | | | | | | | | | | | | | | | | | | | Autogenerated using `bin/bundle exec license_finder report --format=csv --save=vendor/licenses.csv` Required license_finder 3.0.1 for https://github.com/pivotal/LicenseFinder/pull/304
* | | | Merge branch 'sh-bump-sidekiq' into 'master'Robert Speicher2017-07-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Sidekiq from 5.0.0 to 5.0.4 See merge request !12774
| * | | | Update Sidekiq from 5.0.0 to 5.0.4sh-bump-sidekiqStan Hu2017-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | See: https://github.com/mperham/sidekiq/blob/master/Changes.md
* | | | | Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into ↵Kamil Trzciński2017-07-113-130/+169
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Do not show pipeline schedule button for non-member Closes #34907 See merge request !12757
| * | | | | 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 FireFox See merge request !12777
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 9.4 update instructions to include changes made to 9.3 instructions See merge request !12781
| * | | | | | 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 URLs Closes #34882 See merge request !12780
| * | | | | | | Don't reload ActiveRecord objects when building note URLsSean McGivern2017-07-112-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we build a note URL, and we have the note loaded already, there are two cases: 1. The `noteable` is already loaded. In that case, this is faster as it doesn't build a new AR object from the query. 2. The `noteable` is not already loaded. In that case, this change is no worse than the previous code.
* | | | | | | | Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update source installation instructions for 9.4 See merge request !12779
| * | | | | | | | 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.4 See merge request !12784
| * | | | | | | 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 alignment Closes #34933 See merge request !12778
| * | | | | | 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'" Closes #34942 See merge request !12783
| * | | | | | Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'"Rémy Coutable2017-07-113-6/+6
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !12753
* | | | | | | Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Disabled prepared statements in test See merge request !12773
| * | | | | | Disabled prepared statements in testsh-disabled-prepared-statements-in-testStan Hu2017-07-102-0/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests may test migrations and change the types of columns. If this happens, Rails may cache a statement that will cause PostgreSQL to fail with the message, "cached plan must not change result type": https://github.com/rails/rails/issues/12330 This happened in https://gitlab.com/gitlab-org/gitlab-ee/issues/2890#note_34636077.
* | | | | | 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 ones Closes #34911 See merge request !12760
| * | | | | | Reduce parallelization of Spinach jobs and increase the RSpec ones34911-balance-spinach-jobs-to-rspecRémy Coutable2017-07-101-63/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | 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 CI See merge request !12761
| * | | | | | | Don't attempt to warm the Capybara cache outside of CIrs-warm-capybara-only-in-ciRobert Speicher2017-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We initially started doing this because the first feature test to use the JavaScript driver would often time out due to asset compilation on CI. We should still do it in CI since the cost is (relatively) low, but doing so for every local run is both tiresome and generally unnecessary, as developer machines will be faster than most shared CI runners, and the cost of retrying a test after a timeout is much, much lower.
* | | | | | | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-1113-90/+228
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
| * | | | | | | Differentiate shared test context using options hash instead of subject.33949-remove-healthcheck-access-tokenPawel Chojnacki2017-07-103-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + fix typos, and capitalization + point configuration to `gitlab.rb` as well
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + fix wrong test setup
| * | | | | | | Finish refactring processed configuraiton, and add test validating ip range ↵Pawel Chojnacki2017-07-052-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matching
| * | | | | | | 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 ↵Pawel Chojnacki2017-07-054-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as deprecated
| * | | | | | | Remove the need to use health check tokenPawel Chojnacki2017-07-0510-65/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in favor of whitelist that will be used to control the access to monitoring resources
* | | | | | | | Merge branch '34909-pipeline-dropdown-z-index' into 'master'Filipa Lacerda2017-07-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase z index of mini pipeline dropdown Closes #34909 See merge request !12767
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paginate the merge requests API earlier to avoid eager loading every merge request See merge request !12764
| * | | | | | | | | 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 ↵Stan Hu2017-07-101-1/+2
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request Fixes a performance regression introduced in !12732
* | | | | | | | | 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` Closes gitlab-ee#2890 See merge request !12770
| * | | | | | | | | Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`sh-fix-award-emoji-specStan Hu2017-07-101-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ee#2890
View Lorry Controller Status