summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Improve the Users API specs by asserting against the response schemarc/improve-users-api-specsRémy Coutable2017-09-183-32/+27
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '24121_extract_yet_another_users_finder' into 'master'Grzegorz Bizon2017-09-181-0/+97
|\ | | | | | | | | | | | | Extract AutocompleteController#users into finder Closes #24121 See merge request gitlab-org/gitlab-ce!13778
| * move `find_users` method into finder and add `load_group` methodMaxim Rydkin2017-09-101-4/+28
| |
| * rename yet_another_users_finder into autocomplete_users_finderMaxim Rydkin2017-09-101-1/+1
| |
| * fix rubocopMaxim Rydkin2017-09-101-8/+7
| |
| * finish spec/finders/yet_another_users_finder_spec.rbMaxim Rydkin2017-09-101-54/+42
| |
| * extract finder and add first testMaxim Rydkin2017-09-101-0/+86
| |
* | Merge branch 'replace_project_commits_revert.feature' into 'master'Rémy Coutable2017-09-181-0/+56
|\ \ | | | | | | | | | | | | Replace the 'project/commits/revert.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14325
| * | Replace the 'project/commits/revert.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-181-0/+56
| | |
* | | Merge branch 'replace_project_archived.feature' into 'master'Rémy Coutable2017-09-181-0/+43
|\ \ \ | | | | | | | | | | | | | | | | Replace the 'project/archived.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14322
| * | | Replace the 'project/archived.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-171-0/+43
| |/ /
* | | Merge branch 'improve_spec_features_profiles_specs' into 'master'Rémy Coutable2017-09-188-38/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve 'spec/features/profiles/*' specs Closes #37855 et #37856 See merge request gitlab-org/gitlab-ce!14317
| * | | Improve 'spec/features/profiles/*' specsVitaliy @blackst0ne Klachkov2017-09-168-38/+39
| | | |
* | | | Merge branch 'replace_search.feature' into 'master'Rémy Coutable2017-09-1812-310/+559
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace the 'search.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14248
| * | | | Replace the 'search.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-1612-310/+559
| |/ / /
* | | | Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master'Douwe Maan2017-09-183-0/+220
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Clean up redirect routes that conflict with regular routes Closes #36229 See merge request gitlab-org/gitlab-ce!13783
| * | | Reduce batch sizemk-delete-conflicting-redirects-mysqlMichael Kozono2017-09-141-4/+4
| | | | | | | | | | | | | | | | …to stay within our query timeout of 60s. Also reduce the job interval to keep the same overall migration time of ~3.3 days.
| * | | Spread out the work a littleMichael Kozono2017-09-142-6/+73
| | | |
| * | | Extract helper for queuing background jobsMichael Kozono2017-09-142-2/+64
| | | |
| * | | Add specs for deleting conflicting redirectsMichael Kozono2017-09-142-0/+91
| | | |
* | | | Fixed the new sidebars width when browser has scrollbarsPhil Hughes2017-09-161-1/+8
| | | |
* | | | Merge branch 'master' into 'issue_37640'issue_37640Felipe Artur2017-09-1587-1909/+2938
|\ \ \ \ | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ \ Merge branch 'fix-share-with-group-lock-update' into 'master'Robert Speicher2017-09-151-0/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix setting share_with_group_lock Closes #37916 See merge request gitlab-org/gitlab-ce!14300
| | * | | | Fix setting share_with_group_lockfix-share-with-group-lock-updateYorick Peterse2017-09-151-0/+15
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit running Namespace#force_share_with_group_lock_on_descendants would result in updating _all_ namespaces in the namespaces table, not just the descendants. This is the result of ActiveRecord::Relation#update_all not taking into account the CTE. To work around this we use the CTE query as a sub-query instead of directly calling #update_all. To prevent this from happening the relations returned by Gitlab::GroupHierarchy are now marked as read-only, resulting in an error being raised when methods such as #update_all are used. Fortunately on GitLab.com our statement timeouts appear to have prevented this query from actually doing any damage other than causing a very large amount of dead tuples. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37916
| * | | | created services for keyshaseeb2017-09-156-25/+54
| | | | |
| * | | | Merge branch 'projects-controller-show' into 'master'Rémy Coutable2017-09-152-0/+76
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | SQL performance improvements for ProjectsController#show See merge request gitlab-org/gitlab-ce!14226
| | * | | Memoize the latest builds of a pipelineprojects-controller-showYorick Peterse2017-09-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if a pipeline is present for the last commit on a project's homepage we only run 1 query to get the builds, instead of running 2 queries. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878#note_40073339 for more information.
| | * | | Memoize pipelines for project download buttonsYorick Peterse2017-09-141-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Project#latest_successful_pipeline_for and Project#latest_successful_pipeline_for_default_branch. The 2nd method memoizes the result (taking nil values into account) to ensure the underlying query isn't executed multiple times when viewing a project's homepage. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878#note_40073607 for more information.
| * | | | Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-151-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove title attribute from sidebar elements See merge request gitlab-org/gitlab-ce!14140
| | * | | | fixed merge request specrevert-sidebar-title-attributePhil Hughes2017-09-131-1/+1
| | | | | |
| * | | | | Merge branch '20824-scope-users-to-members-in-group-issuable-list' into 'master'Phil Hughes2017-09-154-0/+45
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Scope users by group inside dropdowns if I'm on group page (Issue, MRs)" Closes #20824 See merge request gitlab-org/gitlab-ce!14249
| | * | | | Return only group's members in user dropdowns on issuables list pages20824-scope-users-to-members-in-group-issuable-listRémy Coutable2017-09-144-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch '37872-fix-nasty-gdk-nuke' into 'master'Robert Speicher2017-09-142-37/+51
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "`bin/rspec`/`bin/karma` can nuke the GDK entirely" Closes #37872 See merge request gitlab-org/gitlab-ce!14276
| | * | | | | Make TestInit.setup_gitlab_shell and TestInit.setup_gitaly more robust37872-fix-nasty-gdk-nukeRémy Coutable2017-09-141-36/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Abort when `TestEnv.init` is not called in the `test` environmentRémy Coutable2017-09-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Force `RAILS_ENV` to `test` in `spec/spec_helper.rb`Rémy Coutable2017-09-141-1/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch 'bvl-extend-query-recorder' into 'master'Rémy Coutable2017-09-143-7/+39
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the QueryRecorder matcher See merge request gitlab-org/gitlab-ce!14267
| | * | | | | Use the new query-recorder features as a PoCbvl-extend-query-recorderBob Van Landuyt2017-09-142-5/+5
| | | | | | |
| | * | | | | Extend the QueryRecorder matcherBob Van Landuyt2017-09-141-2/+34
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | So it can report the queries that we're run more compared to the control point.
| * | | | | Merge branch 'gitlab-git-user' into 'master'Rémy Coutable2017-09-143-17/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Gitlab::Git::Committer to User See merge request gitlab-org/gitlab-ce!14254
| | * | | | | Rename Gitlab::Git::Committer to UserJacob Vosmaer2017-09-143-17/+17
| | | | | | |
| * | | | | | Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'Grzegorz Bizon2017-09-141-4/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider Closes #37845 See merge request gitlab-org/gitlab-ce!14263
| | * | | | | | Don't force the encoding of the OAuth provider in ↵37845-fix-oauth-provider-forced-encodingRémy Coutable2017-09-141-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::OAuth::AuthHash#provider Some providers freeze their name (e.g. https://github.com/zquestz/omniauth-google-oauth2/blob/414c43ef3ffec37d473321f262e80f1e46dda89f/lib/omniauth/strategies/google_oauth2.rb#L1), so trying to modify the string would fail with a `can't modify frozen String` exception (see https://gitlab.com/gitlab-org/gitlab-ce/issues/37845#note_40308148). In this case, we can just stop trying to force the encoding of the provider name as they should always be in utf8 by default. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Merge branch '37759-also-treat-newlines-as-separator' into 'master'Kamil Trzciński2017-09-141-13/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat newlines as separators for pipeline emails service Closes #37759 See merge request gitlab-org/gitlab-ce!14250
| | * | | | | | | Also treat newlines as separator, as people would do thatLin Jen-Shin2017-09-131-13/+24
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, I don't know if those emails would work having newlines in them.
| * | | | | | | Restore has_visible_content? to improve performance (cache)repo-cache-fixJarka Kadlecova2017-09-141-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | This method was moved to ::Git but it is not cached there which causes performance problems
| * | | | | | Merge branch '34510-board-issues-sql-speedup' into 'master'Douwe Maan2017-09-141-0/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #34510 add association preloading for issue boards Closes #34510 See merge request gitlab-org/gitlab-ce!14198
| | * | | | | | fix another N+1 query for label priorities34510-board-issues-sql-speedupmicael.bergeron2017-09-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a QueryRecorder for IssuesController#index.json
| * | | | | | | Merge branch ↵Douwe Maan2017-09-142-2/+15
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
| | * | | | | | changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-headermicael.bergeron2017-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated the spec