summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'replace_project_snippets.feature' into 'master'Rémy Coutable2017-09-184-0/+90
|\
| * Replace the 'project/snippets.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-184-0/+90
* | Merge branch 'operation-service-merge' into 'master'Rémy Coutable2017-09-184-32/+11
|\ \
| * | Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-154-32/+11
* | | Merge branch '24121_extract_yet_another_users_finder' into 'master'Grzegorz Bizon2017-09-181-0/+97
|\ \ \
| * | | 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 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 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/*' 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 analogVitaliy @blackst0ne Klachkov2017-09-1612-310/+559
| |/ / / /
* | | | | Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master'Douwe Maan2017-09-183-0/+220
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Reduce batch sizemk-delete-conflicting-redirects-mysqlMichael Kozono2017-09-141-4/+4
| * | | | 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
|\ \ \ \ \
| * \ \ \ \ Merge branch 'fix-share-with-group-lock-update' into 'master'Robert Speicher2017-09-151-0/+15
| |\ \ \ \ \
| | * | | | | Fix setting share_with_group_lockfix-share-with-group-lock-updateYorick Peterse2017-09-151-0/+15
| | | |/ / / | | |/| | |
| * | | | | created services for keyshaseeb2017-09-156-25/+54
| * | | | | Merge branch 'projects-controller-show' into 'master'Rémy Coutable2017-09-152-0/+76
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Memoize the latest builds of a pipelineprojects-controller-showYorick Peterse2017-09-141-0/+20
| | * | | | Memoize pipelines for project download buttonsYorick Peterse2017-09-141-0/+56
| * | | | | Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-151-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | 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
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | 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
| * | | | | Merge branch '37872-fix-nasty-gdk-nuke' into 'master'Robert Speicher2017-09-142-37/+51
| |\ \ \ \ \
| | * | | | | Make TestInit.setup_gitlab_shell and TestInit.setup_gitaly more robust37872-fix-nasty-gdk-nukeRémy Coutable2017-09-141-36/+45
| | * | | | | Abort when `TestEnv.init` is not called in the `test` environmentRémy Coutable2017-09-141-0/+5
| | * | | | | Force `RAILS_ENV` to `test` in `spec/spec_helper.rb`Rémy Coutable2017-09-141-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'bvl-extend-query-recorder' into 'master'Rémy Coutable2017-09-143-7/+39
| |\ \ \ \ \
| | * | | | | 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
| | |/ / / /
| * | | | | Merge branch 'gitlab-git-user' into 'master'Rémy Coutable2017-09-143-17/+17
| |\ \ \ \ \
| | * | | | | 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#pro...37845-fix-oauth-provider-forced-encodingRémy Coutable2017-09-141-4/+3
| * | | | | | | Merge branch '37759-also-treat-newlines-as-separator' into 'master'Kamil Trzciński2017-09-141-13/+24
| |\ \ \ \ \ \ \
| | * | | | | | | Also treat newlines as separator, as people would do thatLin Jen-Shin2017-09-131-13/+24
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Restore has_visible_content? to improve performance (cache)repo-cache-fixJarka Kadlecova2017-09-141-2/+2
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch '34510-board-issues-sql-speedup' into 'master'Douwe Maan2017-09-141-0/+11
| |\ \ \ \ \ \