summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Missing dependency should fail jobfeature/sm/34834-missing-dependency-should-fail-jobShinya Maeda2017-08-302-1/+17
|
* Merge branch '36582-fix-note-resolved-icon' into 'master'evn-fix-formatting-of-claFatih Acet2017-08-286-6/+25
|\ | | | | | | | | | | | | Update and fix resolvable note icons for easier recognition Closes #36582 See merge request !13821
| * Update and fix resolvable note icons for easier recognition36582-fix-note-resolved-iconEric Eastwood2017-08-256-6/+25
| |
* | Merge branch 'zj-update-templates-with-warning-header' into 'master'Stan Hu2017-08-283-0/+0
|\ \ | | | | | | | | | | | | | | | | | | Update templates to include header in the README Closes #36904 See merge request !13785
| * | Update templates to include header in the READMEZeger-Jan van de Weg2017-08-233-0/+0
| | |
* | | Update CHANGELOG.md for 9.5.2Jose Ivan Vargas2017-08-287-32/+9
| | | | | | | | | [ci skip]
* | | Merge branch 'rs-transient-mini-pipeline-graph-failure' into 'master'Douwe Maan2017-08-281-14/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix a transient failure in mini_pipeline_graph_spec Closes #34323 See merge request !13844
| * | | Fix a transient failure in mini_pipeline_graph_specrs-transient-mini-pipeline-graph-failureRobert Speicher2017-08-281-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This spec failed reliably with a specific run order (see issue), the reasons for which are still unknown. This simplification resolves the failure. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34323
* | | | Merge branch 'group-mr-search-bar' into 'master'Clement Ho2017-08-284-3/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add filtered search to group merge requests dashboard Closes #36703 See merge request !13688
| * | | | Add changelog entryHiroyuki Sato2017-08-281-0/+5
| | | | |
| * | | | Add a simple spec that checks filtered search works at group merge request pageHiroyuki Sato2017-08-271-0/+15
| | | | |
| * | | | Add filtered search to group merge requests dashboardHiroyuki Sato2017-08-192-3/+7
| | | | |
* | | | | Merge branch 'sh-add-spec-to-protected-tags-deletion' into 'master'Robert Speicher2017-08-281-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add spec for deleting protected tags See merge request !13693
| * | | | | Add spec for deleting protected tagssh-add-spec-to-protected-tags-deletionStan Hu2017-08-201-0/+17
| |/ / / /
* | | | | Merge branch 'fix/import-events' into 'master'Sean McGivern2017-08-284-1/+15
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix events error importing GitLab projects Closes #36965 See merge request !13868
| * | | | fix typoJames Lopez2017-08-281-1/+1
| | | | |
| * | | | fix specJames Lopez2017-08-282-1/+6
| | | | |
| * | | | Fix events error importing GitLab projectsJames Lopez2017-08-282-0/+9
| | | | |
* | | | | Merge branch 'sh-improve-flaky-ace-editor-spec' into 'master'Robert Speicher2017-08-281-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve flaky ACE editor spec See merge request !13854
| * | | | | Improve flaky ACE editor specsh-improve-flaky-ace-editor-specStan Hu2017-08-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ACE editor JavaScript may not be loaded when the spec runs evaluateScript. Wait for the editor to load before attempting to run ACE-specific JavaScript.
* | | | | | Merge branch 'fix-flakes' into 'master'Robert Speicher2017-08-283-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix transient dropdown test failures Closes #37052 and #34436 See merge request !13862
| * | | | | | fix transient test failures caused by wrong dropdown triggerfix-flakesSimon Knox2017-08-283-3/+3
| | | | | | |
* | | | | | | 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