summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| | * | | | | fix another N+1 query for label priorities34510-board-issues-sql-speedupmicael.bergeron2017-09-121-0/+11
| * | | | | | Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-th...Douwe Maan2017-09-142-2/+15
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | 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
| | * | | | | rework the html_safe not to use haml's auto escapingmicael.bergeron2017-09-111-0/+13
| * | | | | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-131-0/+9
| |\ \ \ \ \ \
| | * | | | | | Backport more EE changes to Gitlab::UrlSanitizerNick Thomas2017-09-111-0/+9
| * | | | | | | Merge branch 'ce-backport-new-sidebar-boards' into 'master'Filipa Lacerda2017-09-131-6/+18
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | CE backport of new-sidebar-boardsce-backport-new-sidebar-boardsPhil Hughes2017-09-131-6/+18
| * | | | | | | Merge branch 'backstage/gb/optimize-some-specs-with-rspec-set' into 'master'Rémy Coutable2017-09-138-41/+59
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix job coverage specsbackstage/gb/optimize-some-specs-with-rspec-setGrzegorz Bizon2017-09-131-1/+1
| | * | | | | | Fix build specs after using `set` instead of `let`Grzegorz Bizon2017-09-131-13/+22
| | * | | | | | Fix syntax error in LFS objects specsGrzegorz Bizon2017-09-131-1/+1
| | * | | | | | Optimize CI/CD build retry service specsGrzegorz Bizon2017-09-131-4/+5
| | * | | | | | Optimize CI/CD build model specsGrzegorz Bizon2017-09-131-8/+5
| | * | | | | | Optimize generic specs for servicesGrzegorz Bizon2017-09-131-6/+7
| | * | | | | | Optimize a few simple spec files by using `set`Grzegorz Bizon2017-09-134-6/+9
| | * | | | | | Optimize LFS objects specsGrzegorz Bizon2017-09-131-4/+11
| * | | | | | | escape characters in git user nameBrandon Everett2017-09-131-0/+11
| * | | | | | | Merge branch 'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger...Kamil Trzciński2017-09-131-0/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Add change log. Fix spec.fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variablesShinya Maeda2017-09-131-1/+1
| | * | | | | | Fix PipelineTriggerService to associate trigger_request with buildsShinya Maeda2017-09-131-0/+2
| * | | | | | | Merge branch 'zj-auto-devops-banner' into 'master'Kamil Trzciński2017-09-131-0/+16
| |\ \ \ \ \ \ \
| | * | | | | | | Fix extra space in YAML arrayZeger-Jan van de Weg2017-09-131-1/+1
| | * | | | | | | AutoDevOps banner hidden on explicit CI configZeger-Jan van de Weg2017-09-131-0/+16
| | | |_|/ / / / | | |/| | | | |