summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix specfix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500-internal-server-error-in-9-5-1Shinya Maeda2017-08-291-14/+10
|
* Fix changelogShinya Maeda2017-08-291-1/+1
|
* Fix specShinya Maeda2017-08-291-3/+3
|
* Add changelogShinya Maeda2017-08-291-0/+5
|
* Remove trigger_request.trigger.ownerShinya Maeda2017-08-292-13/+13
|
* Reproduced bugShinya Maeda2017-08-291-0/+16
|
* Merge branch '36061-mr-ref' into 'master'Sean McGivern2017-08-282-0/+8
|\ | | | | | | | | Instrument MergeRequest#ensure_ref_fetched See merge request !13876
| * Instrument MergeRequest#ensure_ref_fetched36061-mr-refJarka Kadlecova2017-08-282-0/+8
| |
* | Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'Douwe Maan2017-08-282-19/+1
|\ \ | | | | | | | | | | | | | | | | | | Reenable MySQL tests on all CE and EE branches part 2 Closes #36384 See merge request !13840
| * | Reenable MySQL tests on all branchesmk-reenable-mysql-tests-on-all-branchesMichael Kozono2017-08-252-19/+1
| | | | | | | | | | | | To protect master from surprise failures, as long as we continue to support MySQL.
* | | Merge branch '36792-inline-user-refresh-when-creating-project' into 'master'Douwe Maan2017-08-288-15/+107
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't wait for project authorization sidekiq jobs when creating projects Closes #36792 See merge request !13775
| * | | Don't treat gitlab project imports specially in Projects::CreateServiceNick Thomas2017-08-251-4/+2
| | | |
| * | | Don't add admins as masters to projects created in another user's namespaceNick Thomas2017-08-252-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only admins have the ability to create a project in another user's personal namespace. Prior to this commit, we were explicitly adding them as masters to the project. However, admins already have access (by virture of being admins), so this is unnecessary.
| * | | Move sidekiq-based project authorization refresh out of Projects::CreateServiceNick Thomas2017-08-257-12/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the project is in a group, the `group.refresh_members_authorized_projects` is made non-blocking, and we call `current_user.refresh_authorized_projects` directly. Projects in a personal namespace are more difficult. Rather than passing the `blocking:` parameter through the entire `add_master` chain, have the `AuthorizedProjectsWorker` automatically inline authorizations for three IDs or less. Since the maximum number of IDs in this path is 2, that has the same effect.
* | | | Merge branch 'rs-aggregate-system-note-specs' into 'master'Douwe Maan2017-08-281-25/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Combine multiple expectations into one for shared system note example See merge request !13814
| * | | | Combine multiple expectations into one for shared system note examplers-aggregate-system-note-specsRobert Speicher2017-08-241-25/+4
| |/ / / | | | | | | | | | | | | | | | | These are all performing unique checks on the same object, so there's no benefit to isolating them.
* | | | Merge branch 'fix/gb/clear-schema-cache-after-running-migration-tests' into ↵Sean McGivern2017-08-281-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Clear schema cache after running tests for migrations Closes #37086 See merge request !13870
| * | | | Clear schema cache after running tests for migrationsGrzegorz Bizon2017-08-281-0/+2
| | | | |
* | | | | Merge branch 'rs-remove-filtered-issues-skips' into 'master'Douwe Maan2017-08-281-50/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove skipped examples in filtered issues feature spec See merge request !13845
| * | | | | Remove skipped examples in filtered issues feature specrs-remove-filtered-issues-skipsRobert Speicher2017-08-251-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We perform a ton of expensive setup in this spec, via both `before` and `let!`. When we use `skip` inside an `it` block, rather than skipping the block entirely via `xit`, we still perform this expensive setup, only to do absolutely nothing with it, resulting in wasted time. Minutes, in this case. Further, these specs have been sitting in our test suite for about seven months now, so the likelihood of them being addressed soon seems low.
* | | | | | Merge branch '35642-add-owner-to-triggers-factory' into 'master'Kamil Trzciński2017-08-284-7/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we have an owner for triggers Closes #35642 See merge request !13799
| * | | | | Merge remote-tracking branch 'upstream/master' into ↵35642-add-owner-to-triggers-factoryLin Jen-Shin2017-08-28222-678/+1615
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35642-add-owner-to-triggers-factory * upstream/master: (49 commits) Fire system hooks when a user is created via LDAP or OAuth Common Docker Documentation Location in `gitlab-ce` fix deprecation warning present during webpack compiles Enable 5 lines of Sidekiq backtrace lines to aid in debugging Add support for copying permalink to notes via more actions dropdown Docs: update - fix headers Handle creating a nested group on MySQL correctly Decrease statuses batch size even more in a migration Fix failure when issue author is nil Fix searching for files by path Fix invite by email address duplication Revert "Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'" Fix repo editor scrollbar Revert "Merge branch 'sh-sidekiq-backtrace' into 'master'" Replace 'source/search_code.feature' spinach test with an rspec analog Add missing third argument to `Git::Repository#initialize` in spec New doc: how to install GitLab on Azure Authorizations regarding OAuth - style confirmation Enable 5 lines of Sidekiq backtrace lines to aid in debugging Reenable MySQL tests on all branches ...
| * | | | | | Remove duplicate update for ownerLin Jen-Shin2017-08-281-1/+0
| | | | | | |
| * | | | | | Make default trigger factory generate an ownerLin Jen-Shin2017-08-254-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And specify owners more clearly
* | | | | | | Merge branch 'sh-simplify-system-hook-testing' into 'master'Douwe Maan2017-08-284-61/+63
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify system hook testing and guarantee test will fire Closes #37067 See merge request !13858
| * | | | | | | Simplify system hook testing and guarantee test will firesh-simplify-system-hook-testingStan Hu2017-08-274-61/+63
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in !11728 would cause an arbitrary project to be chosen to test system hooks, and it's likely that the project would not have any commits or relevant commits to test the hook. This would prevent admins from verifying that the hook fired. Instead of trying to create a representative hook dynamically, just send static data to guarantee the hook will actually be tested. Closes #37067
* | | | | | | Merge branch 'bugfix.notify-custom-participants' into 'master'Sean McGivern2017-08-284-31/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix.notify custom participants Closes #36610 See merge request !13680
| * | | | | | | add a description to the changelogbugfix.notify-custom-participantshttp://jneen.net/2017-08-221-1/+1
| | | | | | | |
| * | | | | | | add a changeloghttp://jneen.net/2017-08-211-0/+5
| | | | | | | |
| * | | | | | | rm a comment that is a liehttp://jneen.net/2017-08-211-1/+0
| | | | | | | |
| * | | | | | | don't rely on order of notification levelshttp://jneen.net/2017-08-211-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | factor out #suitable_notification_level? and check manually by notification level. this makes the notification logic clear and actually reflect what is in the documentation as to what should happen with each setting.
| * | | | | | | actually use the :participating notification typehttp://jneen.net/2017-08-211-1/+1
| | | | | | | |
| * | | | | | | add a spec for a participant with a :custom settinghttp://jneen.net/2017-08-211-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where that custom setting is not enabled.
* | | | | | | | Merge branch 'docs/update-ci-docker-using-docker-images' into 'master'Achilleas Pipinellis2017-08-282-7/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 'Using Docker images' documentation Closes gitlab-ci-multi-runner#2696 See merge request !13848
| * | | | | | | | Update 'Using Docker images' documentationTomasz Maczukin2017-08-282-7/+38
|/ / / / / / / /
* | | | | | | | Merge branch 'backstage/gb/rename-ci-cd-processing-sidekiq-queues' into 'master'Grzegorz Bizon2017-08-2822-35/+197
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename CI/CD related Sidekiq queues Closes #35532 See merge request !13714
| * \ \ \ \ \ \ \ Merge commit '2be34630623711fc20ef8c101b5cef688f207cc1' into ↵backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-2647-227/+543
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/rename-ci-cd-processing-sidekiq-queues * commit '2be34630623711fc20ef8c101b5cef688f207cc1': Common Docker Documentation Location in `gitlab-ce` fix deprecation warning present during webpack compiles Enable 5 lines of Sidekiq backtrace lines to aid in debugging Add support for copying permalink to notes via more actions dropdown Handle creating a nested group on MySQL correctly Decrease statuses batch size even more in a migration Fix repo editor scrollbar Replace 'source/search_code.feature' spinach test with an rspec analog Authorizations regarding OAuth - style confirmation Update README.md Refactor complicated API group finding rules into GroupsFinder Fix group and project search for anonymous users Document version Group Milestones API introduced Allow v4 API GET requests for groups to be unauthenticated Adjust a range and a size in stages statuses migration Update README.md Point to /developers on docs/administration/authentiq.md Indexes GFM markdown guide use inline links instead of referenced Add index on ci_runners.contacted_at
| * | | | | | | | Migrate new jobs when reverting pipeline queues migrationGrzegorz Bizon2017-08-252-2/+10
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'Kamil Trzciński2017-08-25474-1566/+2878
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | Fix invalid default argument in migration helpersGrzegorz Bizon2017-08-231-1/+1
| | | | | | | | | |
| * | | | | | | | | Enqueue a new stage worker in CI/CD processing queueGrzegorz Bizon2017-08-221-0/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-22117-2255/+1506
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (115 commits) Use event-based waiting in Gitlab::JobWaiter Make sure repository's removal work for legacy and hashed storages Use `@hashed` prefix for hashed paths on disk, to avoid collision with existing ones Refactor project and storage types Prevent using gitlab import task when hashed storage is enabled Some codestyle changes and fixes for GitLab pages Removed some useless code, codestyle changes and removed an index Fix repository reloading in some specs Changelog Moving away from the "extend" based factory to a more traditional one. Enable automatic hashed storage for new projects by application settings New storage is now "Hashed" instead of "UUID" Add UUID Storage to Project Move create_repository back to project model as we can use disk_path and share it Codestyle: move hooks to the same place and move dependent methods to private Use non-i18n values for setting new group-level issue/MR button text indexes external issue tracker copyedit indexes user/search/ from /user/index Correctly encode string params for Gitaly's TreeEntries RPC ...
| * | | | | | | | | | Fix indentation in migration helpersGrzegorz Bizon2017-08-221-9/+9
| | | | | | | | | | |
| * | | | | | | | | | Add specs for pipeline sidekiq queues migrationGrzegorz Bizon2017-08-221-0/+50
| | | | | | | | | | |
| * | | | | | | | | | Add migration that migrates CI/CD queuesGrzegorz Bizon2017-08-222-1/+15
| | | | | | | | | | |
| * | | | | | | | | | Add Sidekiq migration helpers for migrating queuesGrzegorz Bizon2017-08-222-3/+62
| | | | | | | | | | |
| * | | | | | | | | | Revert adding shared examples for every sidekiq workerGrzegorz Bizon2017-08-2256-120/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this already exists in `every_sidekiq_worker_spec.rb`.
| * | | | | | | | | | Fix incorrect `let` in pipeline metrics worker specsGrzegorz Bizon2017-08-221-1/+8
| | | | | | | | | | |
| * | | | | | | | | | Fix inconsistent Sidekiq queues names in worker specsGrzegorz Bizon2017-08-221-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix typo in shared examples name in worker specsGrzegorz Bizon2017-08-221-1/+1
| | | | | | | | | | |