summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2017-09-066-96/+460
|\ | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-objectRobert Speicher2017-09-061-29/+56
| |\ | | | | | | | | | | | | Migrate creating/deleting a branch to Gitaly See merge request !13864
| | * Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitalyAhmad Sherif2017-09-061-29/+56
| | |
| * | Merge branch 'url-sanitizer-fixes' into 'master'Douwe Maan2017-09-061-50/+129
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix problems sanitizing URLs with empty passwords Closes gitlab-ee#3352 See merge request !14083
| | * | Remove blank passwords from sanitized URLsNick Thomas2017-09-061-51/+129
| | | |
| | * | Backport EE fixes to Gitlab::UrlSanitizer to CENick Thomas2017-09-061-0/+1
| | | |
| * | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-061-0/+64
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027
| | * \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵Grzegorz Bizon2017-09-0610-104/+432
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
| | * | | | Extract a class that represents artifacts file pathGrzegorz Bizon2017-09-051-0/+64
| | | | | |
| * | | | | Merge branch '35942_api_binary_encoding' into 'master'Sean McGivern2017-09-061-0/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API fix for non UTF-8 data Closes #35942 See merge request !14038
| | * | | | | [ci-skip] spec for an instance method35942_api_binary_encodingmicael.bergeron2017-09-061-1/+1
| | | | | | |
| | * | | | | add .json_safe_diff specmicael.bergeron2017-09-061-0/+19
| | | |_|/ / | | |/| | |
| * | | | | Profile updates from providersAlexander Keramidas2017-09-062-17/+192
| |/ / / /
* | | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0615-115/+489
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch ↵Douwe Maan2017-09-062-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments' into 'master' Add setting to collapse outdated diff comments on push Closes #36994 See merge request !14053
| | * | | | Fix note resolution specsSean McGivern2017-09-061-0/+2
| | | | | |
| | * | | | Add functionality to collapse outdated diff comments regardless of ↵Ashley Dumaine2017-09-062-1/+2
| | | |/ / | | |/| | | | | | | | | | | | discussion resolution
| * | | | Merge branch 'fix/import-export-performance' into 'master'Douwe Maan2017-09-062-10/+13
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Improve Import/Export memory use and performance Closes #35389 and #26556 See merge request !13957
| | * | | fix specsJames Lopez2017-09-051-2/+2
| | | | |
| | * | | fix typoJames Lopez2017-09-051-1/+1
| | | | |
| | * | | refactor code a littleJames Lopez2017-09-051-1/+1
| | | | |
| | * | | fix export performance of CI buildsJames Lopez2017-09-051-8/+11
| | | | |
| * | | | Optimize SQL queries used in Groups::GroupMembersController#create27374-groups-groupmemberscontroller-create-is-slow-due-to-sqlRubén Dávila2017-09-051-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following optimizations were performed: - Add new association to GroupMember and ProjectMember This new association will allow us to check if a user is a member of a Project or Group through a single query instead of two. - Optimize retrieving of Members when adding multiple Users
| * | | Migrate Gitlab::Git::Repository#find_branch to GitalyAhmad Sherif2017-09-051-14/+24
| | | |
| * | | Merge branch 'fuzzy-issue-search' into 'master'Sean McGivern2017-09-051-0/+120
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Fuzzy search issues / merge requests Closes #26835, #29994, and #20362 See merge request !13780
| | * | Fix typoHiroyuki Sato2017-09-051-1/+1
| | | |
| | * | Fix MySQL spec errorsHiroyuki Sato2017-08-311-5/+5
| | | |
| | * | Fuzzy search issuable title or descriptionHiroyuki Sato2017-08-311-0/+120
| | | |
| * | | Merge branch 'mr-index-page-performance' into 'master'Sean McGivern2017-09-051-0/+37
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-use issue/MR counts for the pagination system Closes #27168 See merge request !13805
| | * | | Re-use issue/MR counts for the pagination systemmr-index-page-performanceYorick Peterse2017-09-051-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the issue and MR index pages so the pagination system re-uses the output of the COUNT(*) query used to calculate the number of rows per state (opened, closed, etc). This removes the need for an additional COUNT(*) on both pages.
| * | | | use new #verification_statusAlexis Reigel2017-09-052-16/+11
| | | | |
| * | | | add verification_status: same_user_different_emailAlexis Reigel2017-09-051-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is used to make a difference between a committer email that belongs to user, where the user used a different email for the gpg key. this means that the user is the same, but a different, unverified email is used for the signature.
| * | | | downcase gpg key's emailsAlexis Reigel2017-09-051-0/+15
| | | | | | | | | | | | | | | | | | | | this is necessary for email comparisons
| * | | | extract shared exampleAlexis Reigel2017-09-051-20/+19
| | | | |
| * | | | match the committer's email against the gpg keyAlexis Reigel2017-09-051-69/+113
| | | | | | | | | | | | | | | | | | | | | | | | | the updated verification of a gpg signature requires the committer's email to also match the user's and the key's emails.
| * | | | pass whole commit to Gitlab::Gpg::Commit againAlexis Reigel2017-09-051-0/+21
| |/ / / | | | | | | | | | | | | | | | | we need the commit object for the updated verification that also checks the committer's email to match the gpg key and user's emails.
| * | | - Allow runner API to pass failure_reasonShinya Maeda2017-09-051-0/+1
| | | | | | | | | | | | | | | | - Fix spec
| * | | Merge branch 'feature/gb/kubernetes-only-pipeline-jobs' into 'master'Kamil Trzciński2017-09-041-2/+46
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if Kubernetes is required when creating pipeline jobs Closes #34785 See merge request !13849
| | * \ \ Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobsGrzegorz Bizon2017-09-0418-126/+918
| | |\ \ \ | | | | |/ | | | |/| | | | | | * master: (469 commits)
| | * | | Change CI/CD kubernetes policy keyword to `active`Grzegorz Bizon2017-09-011-4/+4
| | | | |
| | * | | Change kubernetes job policy allowed valuesGrzegorz Bizon2017-08-311-0/+44
| | | | | | | | | | | | | | | | | | | | It is now possible to use `kubernetes: configured`.
| | * | | Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobsGrzegorz Bizon2017-08-3125-71/+543
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (275 commits) Decrease Metrics/PerceivedComplexity threshold to 17 Upgrade mail and nokogiri gems due to security issues Link out to stackoverflow answer on setting swappiness Document swappiness recomendations in the requirements doc Fix invalid attribute used for time-ago-tooltip component Update latest artifacts doc Add changelog entry for flipping verify_certificates Default LDAP config verify_certificates to true Update share project with groups docs remove accidental console.log from karma tests update specs to match reorganized monitoring components Remove tooltips from new sidebar Use `git update-ref --stdin -z` to delete refs Don't use public_send in destroy_conditionally! helper Remove unused expressions policy from ci/cd config Simplify code for appending strategies in CI/CD config Raise exception when simplifiable ci entry incomplete Add changelog entry Fix MySQL failure for emoji autocomplete max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) ... Conflicts: lib/gitlab/ci/config/entry/policy.rb
| | * | | | Use new complex only/except policy internal schemeGrzegorz Bizon2017-08-261-2/+2
| | | | | |
| * | | | | Merge branch 'bvl-only-require-po-parser-in-rake' into 'master'Douwe Maan2017-09-041-0/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only require `simple_po_parser` in rake task that needs it Closes #37379 See merge request !14018
| | * | | | Only require `simple_po_parser` in rake task that needs itbvl-only-require-po-parser-in-rakeBob Van Landuyt2017-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way we don't need to install it in production, since it's really not needed there.
| * | | | | Merge branch ↵Kamil Trzciński2017-09-042-0/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/33281-protected-runner-executes-jobs-on-protected-branch' into 'master' Protected runner executes jobs on protected branch [Solution 1] Closes #33281 See merge request !13194
| | * | | | | Fix typoShinya Maeda2017-09-031-1/+1
| | | | | | |
| | * | | | | Fix schema. Add safe_model_attributes for pipelinesShinya Maeda2017-09-031-0/+1
| | | | | | |
| | * | | | | Impprove spec by godfat suggestionsShinya Maeda2017-09-031-1/+10
| | | | | | |
| | * | | | | Fix specShinya Maeda2017-09-031-0/+1
| | | | | | |
View Lorry Controller Status