Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-15Fix nesting on sessions/new.Bryce Johnson
2016-10-15Click first Sign In in login_helper.Bryce Johnson
2016-10-15Get tests passing.Bryce Johnson
2016-10-10writes tests to verify the issue is solved and fixes breaking issues.tiagonbotelho
2016-10-06Merge commit 'dev/security' into 'master'Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-04Simplify Mentionable concern instance methodsPaco Guzman
We remove some arguments that are rarely used or used just to simplify setups on specs. Modified Mentionable#create_new_cross_references method we don’t need to calculate previous references to avoid the duplication because we do that at database level when creating references extracted from the current entity state. MergeRequests won’t create cross_references for commits that are included so we change a spec to use a different merge request to make references to commits to other branches
2016-09-30fix export project file permissions issueJames Lopez
2016-09-30Small improvements thanks to Robert's feedbackRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-28Fix permission for setting an issue's due dateRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-28Added git http requests tests for user with LDAP identityHoratiu Eugen Vlad
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-27Merge branch '22578-cycle-analytics-incorrect-commit-count'Douwe Maan
2016-09-26Fix the "Commits" section of the cycle analytics summary.Timothy Andrew
- The commit count was capped at 10, due to `Gitlab::Git::Repository#log` enforcing a limit, with the default set to 10. - Reimplement a small portion of this `log` function to get just the data we need.
2016-09-26Fix snippets paginationRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-21Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2016-09-20Implement a second round of review comments from @DouweM.Timothy Andrew
- Don't use `TableReferences` - using `.arel_table` is shorter! - Move some database-related code to `Gitlab::Database` - Remove the `MergeRequest#issues_closed` and `Issue#closed_by_merge_requests` associations. They were either shadowing or were too similar to existing methods. They are not being used anywhere, so it's better to remove them to reduce confusion. - Use Rails 3-style validations - Index for `MergeRequest::Metrics#first_deployed_to_production_at` - Only include `CycleAnalyticsHelpers::TestGeneration` for specs that need it. - Other minor refactorings.
2016-09-20Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew
2016-09-20Fix all cycle analytics specs.Timothy Andrew
A number of failures were introduced due to performance improvements (like pre-calculating metrics).
2016-09-20Test the `CycleAnalytics::Summary` model.Timothy Andrew
2016-09-20Merge branch 'feature/import-export-security-specs' into 'master' Douwe Maan
Import/Export security specs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !1987
2016-09-16Fixed testsPhil Hughes
Added wait for vue helper
2016-09-09Merge branch 'restrict_ldap_return_attributes' into 'master' Robert Speicher
Restrict ldap return attributes ## What does this MR do? Fixes the CE part of #13821. We really only ever need uid, dn, cn, and mail attributes, and in some cases, even less. This merge request strips the request down to those four attributes by default, and allows the caller to specify others, if needed. ## Why was this MR needed? This will improve performance especially in cases where the connection is slow between GitLab and LDAP, or when the LDAP object has lots of attributes we don't care about. See merge request !6187
2016-09-09Request only the LDAP attributes we needDrew Blessing
2016-09-09attempt to fix random error in remote buildJames Lopez
2016-09-09refactored some stuff and added new models / attributes after rebaseJames Lopez
2016-09-09more spec refactoring based on feedbackJames Lopez
2016-09-09fixing a couple of bugs and lots of refactoring of the export file specJames Lopez
2016-09-09add model configuration spec to check for new models. Also refactored ↵James Lopez
attribute_configuration spec
2016-09-09fixed spacingJames Lopez
2016-09-09remove IGNORED_ATTRIBUTES no longer requiredJames Lopez
2016-09-09more refactoring of the specsJames Lopez
2016-09-09refactored specs based on feedbackJames Lopez
2016-09-09Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)
Security and safety improvements for gitlab-workhorse integration Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60 - Use a custom content type when sending data to gitlab-workhorse - Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse This will allow us to build features in gitlab-workhorse that require more trust, and protect us against programming mistakes in the future. This is designed so that no action is required for installations from source. For omnibus-gitlab we need to add code that manages the shared secret. See merge request !5907
2016-09-09Move write_note into SlashCommandsHelper and update other dependent specsStan Hu
2016-09-09Wait for logout message in login_helpersStan Hu
2016-09-09Use wait_for_ajax to avoid database deadlocks after specs are cleanedStan Hu
2016-09-09Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rbStan Hu
Sidekiq async tasks were being run after project namespaces were deleted. Use Sidekiq in fake mode to prevent this from Sidekiq tasks from being enqueued in the first place. Closes #21723
2016-09-07Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew
2016-09-07Fix rubocop spec.Timothy Andrew
2016-09-07Consolidate all cycle analytics helper methods.Timothy Andrew
1. Move the test generation to `CycleAnalyticsHelpers::TestGeneration` 2. Move all helper methods (previously placed in each individual spec file) to `CycleAnalyticsHelpers`
2016-09-07Add a test case for "end condition happens before start condition".Timothy Andrew
- In the cycle analytics specs.
2016-09-07Test the `production` cycle analytics phase.Timothy Andrew
Add a `before_end_fn` option to the code that generates cycle analytics specs. `before_end_fn` is called before the end conditions are. Used for data setup that needs to be called after the start conditions and before the end conditions.
2016-09-07Test the `staging` cycle analytics phase.Timothy Andrew
Remove overlap from the "start + end" durations in the happy test case. For the `staging` phase, the end time is the _first_ deployment that happens after the MR merge. If we have 5 MRs where the `start_time`s (merge time) are the same, and all the `end_time`s (deploy to production) a few days from now, only the earliest deploy will get picked up, because that consitutes a deploy for _all_ the MRs. We fix this by removing overlap. Every `start_time` is now generated to be _after_ the preceding `end_time`.
2016-09-07Generate branch/file names more randomly to avoid failures.Timothy Andrew
- Tests would randomly fail because of naming conflicts. - Use a `random_git_name` method instead of using `FFaker` directly.
2016-09-07Test the `code` cycle analytics phase.Timothy Andrew
- Move the "data belongs to other project" test case into the generated tests, and remove the explicit tests from the `code` and `plan` phases.
2016-09-05Verify JWT messages from gitlab-workhorseJacob Vosmaer
2016-09-04Make sure DatabaseCleaner.clean runs AFTER Capybara's cleanupAirat Shigapov
2016-09-02Refactor cycle analytics specs.Timothy Andrew
1. Generalise the specs that will be common across all cycle analytics phases. 2. Rewrite specs `issue` and `plan` to use this abstracted testing strategy. 3. Specs that are specific to a given phase, or unwieldy to test in an abstracted manner, are added to each phase's spec.
2016-08-30Merge branch 'shorten-task-status-phrase' into 'master' Douwe Maan
Shorten task status phrase ## What does this MR do? Shortens the task status phrase to make it easier to read ## Are there points in the code the reviewer needs to double check? Shouldn't be any ## Why was this MR needed? Improve readability/scan-ability of the issues table ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-27_at_12.38.17_PM](/uploads/12d54e4ce24dea203e8f7189b32e3a43/Screen_Shot_2016-08-27_at_12.38.17_PM.png) After: ![Screen_Shot_2016-08-27_at_12.38.05_PM](/uploads/7dfcc3284025b889f6afa09ca273d928/Screen_Shot_2016-08-27_at_12.38.05_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21543 See merge request !6062
2016-08-30Fix resolving conflicts on forksSean McGivern
Forks may not be up-to-date with the target project, and so might not contain one of the parent refs in their repo. Fetch this if it isn't present.
2016-08-29Shorten task status phraseClement Ho