summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Allow query param scope for /issues API endpointtc-issue-api-assigneeToon Claes2017-07-241-4/+12
|
* Add author_id & assignee_id param to /issues APIToon Claes2017-07-241-0/+27
| | | | Allow issues filtering on `author_id` and `assignee_id`.
* Resolve "Lazy load images on the Frontend"Tim Zallmann2017-07-2410-43/+106
|
* Merge branch '35444-error-500-viewing-notes-with-anonymous-user' into 'master'Robert Speicher2017-07-243-4/+26
|\ | | | | | | | | | | | | Resolve "Error 500 viewing notes with anonymous user" Closes #35444 See merge request !13037
| * Don't treat anonymous users as owners when group has pending invitesSean McGivern2017-07-243-4/+26
| | | | | | | | | | | | The `members` table can have entries where `user_id: nil`, because people can invite group members by email. We never want to include those as members, because it might cause confusion with the anonymous (logged out) user.
* | Use `match_array` rather than `eq` in ProjectsFinder specrs-project-finder-spec-mysqlRobert Speicher2017-07-241-4/+4
|/
* Merge branch 'fix/use-another-gitaly-feature-name-for-workhorse-send-blob' ↵Robert Speicher2017-07-241-2/+2
|\ | | | | | | | | | | | | into 'master' Use a unique feature name for Workhorse send blob migration See merge request !13031
| * Use a unique feature name for Workhorse send blob migrationfix/use-another-gitaly-feature-name-for-workhorse-send-blobAhmad Sherif2017-07-241-2/+2
| |
* | Merge branch '31533-usage-data-projects-stats' into 'master'Sean McGivern2017-07-241-4/+25
|\ \ | | | | | | | | | | | | | | | | | | Add Slack and JIRA services counts to Usage Data Closes #31533 See merge request !12974
| * | Add Slack and JIRA services counts to Usage Data31533-usage-data-projects-statsJarka Kadlecova2017-07-241-4/+25
| |/
* | Merge branch '33097-issue-tracker' into 'master'Sean McGivern2017-07-2416-80/+570
|\ \ | | | | | | | | | | | | | | | | | | Associate Issues tab only with internal issues tracker Closes #33097 See merge request !12130
| * | Support both internal and external issue trackersJarka Kadlecova2017-07-2414-58/+492
| | |
| * | Associate Issues tab only with internal issues trackerJarka Kadlecova2017-07-243-23/+79
| |/
* | Merge branch 'upgrade-re2' into 'master'Grzegorz Bizon2017-07-242-4/+18
|\ \ | | | | | | | | | | | | Upgrade the re2 gem to 1.1.0 See merge request !13036
| * | Upgrade the re2 gem to 1.1.0Nick Thomas2017-07-242-4/+18
| |/
* | Decrease ABC threshold to 56.96Maxim Rydkin2017-07-241-0/+136
| |
* | Fix editing project with container images presentGrzegorz Bizon2017-07-241-1/+8
| |
* | Merge branch 'rs-overcreating-users' into 'master'Rémy Coutable2017-07-242-12/+24
|\ \ | |/ |/| | | | | Create guest users only when necessary rather than for every spec See merge request !13024
| * Create guest users only when necessary rather than for every specrs-overcreating-usersRobert Speicher2017-07-212-12/+24
| | | | | | | | | | | | These are two examples of a top-level `before` block doing too much. Only specific specs cared about these guest users, but we were creating them and their `ProjectMember` records for every single spec that ran.
* | Merge branch 'fix-old-ci-api' into 'master'Grzegorz Bizon2017-07-221-0/+66
|\ \ | | | | | | | | | | | | | | | | | | Fix support for old CI API when image or services are not specified Closes #35421 See merge request !13023
| * | Fix support for old CI API when image or services are not specifiedfix-old-ci-apiKamil Trzcinski2017-07-221-0/+66
| |/
* | Short-circuit build coverage extraction for empty regexesNick Thomas2017-07-222-3/+25
| |
* | Merge branch 'zj-pipeline-badge-improvements' into 'master'Grzegorz Bizon2017-07-226-37/+134
|\ \ | | | | | | | | | | | | | | | | | | Pipeline badge improvements Closes #15582 and #20961 See merge request !12966
| * | Port spinach tests to rspec feature specszj-pipeline-badge-improvementsZ.J. van de Weg2017-07-211-5/+61
| | | | | | | | | | | | | | | | | | | | | Logic is the same, just now ported, while this feature was being improved anyway in this branch. Resolves #20961
| * | Reword success to passing for pipeline badgesZ.J. van de Weg2017-07-212-1/+15
| | |
| * | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-215-36/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582. This commit is renaming files and classes from build to pipeline. Also wording is editted to pipeline. Given `pipeline` had more characters than `build`, I've made the field a bit wider. The width now matchers the one for the coverage badge, so they look nice when in a table format, or in a list. As soon as this commit is merged to master, and released, the build.svg is deprecated, meaning that all users which already placed a badge should update it. However, to make sure it keeps working tests are added for this case.
* | | Merge branch '35368-fix-gcovr-regexp-matching' into 'master'Grzegorz Bizon2017-07-221-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix the gcovr coverage regex by removing line separators before scanning Closes #35368 See merge request !13025
| * | | Fix the gcovr coverage regex by removing line separators before scanningNick Thomas2017-07-211-0/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | RE2 differs from Ruby in handling multiple-line strings. The string "foo\n" will not match the regular expression "foo$" unless multi-line mode is enabled (and it's off by default). Since we're already scanning the build trace line by line (and so multi-line coverage regular expressions won't work), we can fix this by removing the line separator before scanning the string.
* | | Merge branch '35178-remember-me-in-omniauth-box-seems-too-close-to-icons' ↵Clement Ho2017-07-211-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | into 'master' add margin above Remember Me for social login Closes #35178 See merge request !12957
| * | add padding above Remember Me for social login35178-remember-me-in-omniauth-box-seems-too-close-to-iconsSimon Knox2017-07-201-1/+1
| | | | | | | | | | | | also fix case
* | | Merge branch 'gitaly-tree-entries' into 'master'Rémy Coutable2017-07-212-8/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Incorporate CommitService.GetTreeEntries Gitaly call Closes gitaly#372 See merge request !12941
| * | | Incorporate CommitService.GetTreeEntries Gitaly callgitaly-tree-entriesAlejandro Rodríguez2017-07-202-8/+47
| | | |
* | | | Merge branch '34549-extract-devise-mappings-into-helper' into 'master'Rémy Coutable2017-07-215-6/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper Closes #34549 See merge request !12742
| * | | | Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test ↵Jacopo2017-07-205-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | helper Extracted `@request.env['devise.mapping'] = Devise.mappings[:user]` and `Rails.application.env_config['devise.mapping'] = Devise.mappings[:user]` in our tests into the helper method `set_devise_mapping`
* | | | | Merge branch 'rs-move-mr-slash-command-spec-from-issues' into 'master'Rémy Coutable2017-07-212-26/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move a spec related to merge requests out of a feature related to issues See merge request !13002
| * | | | | Move a spec related to merge requests out of a feature related to issuesrs-move-mr-slash-command-spec-from-issuesRobert Speicher2017-07-202-26/+18
| | |/ / / | |/| | |
* | | | | Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'Robert Speicher2017-07-211-50/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Commit.find_all to Gitaly Closes gitaly#396 See merge request !12934
| * | | | | Migrate Gitlab::Git::Commit.find_all to Gitalyfeature/migrate-commit-find-all-to-gitalyAhmad Sherif2017-07-201-50/+66
| | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#396
* | | | | | Merge branch '28975-recommend-using-v4-api-on-slash-command-integrations' ↵Robert Speicher2017-07-212-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Recommend V4 API usage on chat slash command integrations Closes #28975 See merge request !12954
| * | | | | | Recommend using V4 API on chat slash command integrations28975-recommend-using-v4-api-on-slash-command-integrationsOswaldo Ferreira2017-07-192-2/+2
| | | | | | |
* | | | | | | Merge branch ↵Robert Speicher2017-07-211-13/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34788-testenv-doesn-t-update-the-component-correctly-when-a-branch-is-specified' into 'master' Improve version handling on component install tasks Closes #34788 See merge request !13006
| * | | | | | | Improve version handling on component install tasks34788-testenv-doesn-t-update-the-component-correctly-when-a-branch-is-specifiedAlejandro Rodríguez2017-07-201-13/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where, when using branch versions, the component wouldn't be updated after the first branch checkout. We also save one step, since checking out the FETCH_HEAD with `-f` already does what `reset --hard` did.
* | | | | | | Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-211-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an infinite loop in Gitlab:UntrustedRegexp See merge request !2146
* | | | | | | Merge branch '31031-convert-protected-branches-es6' into 'master'Filipa Lacerda2017-07-211-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert Protected Branches feature JS code to ES6 See merge request !12970
| * | | | | | | Use JS class for selectorkushalpandya2017-07-191-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'fix/sm/32790-pipeline_schedules-pages-throwing-error-500' into ↵Grzegorz Bizon2017-07-211-0/+24
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Follow-up from "Resolve "pipeline_schedules pages throwing error 500"" Closes #35345, #32790, and #34652 See merge request !12983
| * | | | | | | Add present?Shinya Maeda2017-07-201-0/+24
| | | | | | | |
* | | | | | | | Merge branch '20817-please-add-coordinator-url-to-admin-area-runner-page' ↵Grzegorz Bizon2017-07-201-5/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add coordinator url to admin area runner page Closes #20817 See merge request !11603
| * | | | | | | Add #registration_token for %code20817-please-add-coordinator-url-to-admin-area-runner-pageShinya Maeda2017-07-201-1/+1
| | | | | | | |
| * | | | | | | Add an id for the tag(#registration_token). Wrap long lines.Shinya Maeda2017-07-201-2/+2
| | | | | | | |