summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Backport MR create service changes from EEbackport-mr-create-service-changesSean McGivern2017-07-121-2/+1
| | | | | In EE, the `filter_params` method needs the MR to already have its `target_project` assigned.
* 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
* | | | | | Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'Rémy Coutable2017-07-113-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump knapsack to 1.14.0 Closes #34902 See merge request !12753
| * | | | | | 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 - !11573 See merge request !12775
| * | | | | | | Repair Regression caused by - !11573Paul Charlton2017-07-114-3/+62
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some changes introduced by 4daa6da5407d235cbe4f7a787eaa29304446a870, 26b6e299e1c97b956306572c5c9f6c02f428bfd7, 17898ce021fc365c620d4600df68c3e7d2151619 were regressed during today's merge conflict resolution of !11573. This commit serves to reapply those changes. /cc: @rspeicher @stanhu @mikegreiling
* | | | | | | Merge branch '30392_support_for_multiple_key_value_stores' into 'master'Robert Speicher2017-07-11118-450/+1158
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Support multiple Redis instances based on queue type See merge request !11573
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch redis address error Closes omnibus-gitlab#2545 See merge request !12542
| * | | | | Merge branch 'master' into 'catch-redis-address-error'DJ Mountney2017-07-101685-12592/+31320
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | # Conflicts: # lib/gitlab/current_settings.rb
* | | | | | Merge branch 'fix_milestone_destroy_service' into 'master'Mike Greiling2017-07-102-2/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestones destroy service See merge request !12762
| * | | | | | 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-shell See merge request !12765
| * | | | | doc:installation add note about disable-gems for gitlab-shellJason Plum2017-07-101-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1707#note_34351820 Adding notation about speeding up `gitlab-shell` by disabling RubyGems
* | | | | Merge branch 'revert_bootsnap' into 'master'Robert Speicher2017-07-104-15/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'" See merge request !12755
| * | | | | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"Marin Jankovski2017-07-104-15/+0
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.
* | | | | Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-107-41/+145
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove remaining N+1 queries in merge requests API with emojis and labels Closes #34159 See merge request !12732
| * | | | | 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
| | |_|/ / | |/| | | | | | | | | | | | | Closes #34159
* | | | | Merge branch '34728-fix-application-setting-created-when-redis-down' into ↵Stan Hu2017-07-105-8/+35
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Prevent bad data being added to application settings when Redis is unavailable Closes #34728 See merge request !12750
| * | | | 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 documented Closes #34891 See merge request !12751
| * | | | Re-add Feature.register_feature_groups which is already documentedRémy Coutable2017-07-102-0/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up for !12362 where this was documented but the code was removed in the last iteration. Since this can still be useful and this is already supported by the API, I think re-adding the code was the best course of action. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'fix/gb/qa/configure-headless-chrome-screenshots' into 'master'Rémy Coutable2017-07-101-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Configure headless chrome screenshots correctly See merge request !12746
View Lorry Controller Status