summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'disable-environment-list-polling' into 'master'Grzegorz Bizon2017-06-211-2/+4
|\ | | | | | | | | Disable environment list polling as it breaks deployboard See merge request !12347
| * Disable environment list polling as it breaks deployboardKamil Trzcinski2017-06-211-2/+4
| |
* | Merge branch 'replase_spinach_spec_create.feature' into 'master'Rémy Coutable2017-06-211-0/+27
|\ \ | | | | | | | | | | | | Replace 'create.feature' spinach test with an rspec analog See merge request !12343
| * | Replace 'create.feature' spinach test with an rspec analogblackst0ne2017-06-211-0/+27
| |/
* | Replace invalid chars while seeding environmentsZeger-Jan van de Weg2017-06-211-0/+12
| |
* | Merge branch '33878-fix-edit-deploy-key' into 'master'Rémy Coutable2017-06-212-0/+27
|\ \ | |/ |/| | | | | | | | | Fix edit button for deploy keys available from other projects Closes #33878 See merge request !12301
| * Fix edit button for deploy keys available from other projectsAlexander Randa2017-06-202-0/+27
| |
* | Merge branch 'gitaly-auth-token' into 'master'Sean McGivern2017-06-215-11/+16
|\ \ | | | | | | | | | | | | Pass Gitaly token on Ruby gRPC requests See merge request !12228
| * | Enable gitaly token auth when testingJacob Vosmaer2017-06-201-0/+1
| | |
| * | Send gitaly token to workhorse when neededJacob Vosmaer2017-06-201-1/+5
| | |
| * | Pass Gitaly token on Ruby gRPC requestsJacob Vosmaer2017-06-193-10/+10
| | |
* | | Bulk edit scroll fixBryce Johnson2017-06-211-0/+19
| | |
* | | Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'34013-names-with-spaces-break-issue-filter-barJacob Schatz2017-06-202-32/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note Closes #33868 See merge request !12297
| * | | Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editingEric Eastwood2017-06-202-32/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868 While in a MR "Changes" tab looking at some diff note discussions. Clicking reply and pressing the up-arrow should edit your last comment in that discussion. I suspect this regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178 where we changed the selector
* | | | Merge branch '30213-project-transfer-move-rollback' into 'master'Douwe Maan2017-06-201-0/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rollback project folder move after error in Projects::TransferService Closes #30213 See merge request !11877
| * | | | Rollback project folder move after error in Projects::TransferService30213-project-transfer-move-rollbackJames Edwards-Jones2017-06-201-0/+61
| | | | |
* | | | | Merge branch 'bugfix/html-email-brackets' into 'master'Douwe Maan2017-06-202-0/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unwrap links without an href Closes #27645 See merge request !9045
| * | | | | add a spec for no-href link parsinghttp://jneen.net/2017-06-192-0/+30
| | | | | |
* | | | | | Merge branch 'fix-email-avatars' into 'master'Douwe Maan2017-06-201-31/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix avatar images in pipeline emails Closes gitlab-ee#2696 See merge request !12310
| * | | | | | Fix avatar images in pipeline emailsfix-email-avatarsSean McGivern2017-06-201-31/+60
| | | | | | |
* | | | | | | Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-203-17/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show 'Edit comment'/'Report as abuse' when user has perms/isnt current_user See merge request !12096
| * | | | | | | Remove PersonalSnippet case for reportable_note specshide-edit-comment-and-report-as-abuse-conditionallyLuke "Jared" Bennett2017-06-202-40/+8
| | | | | | | |
| * | | | | | | Fixed reportable_note_shared_example for the reportable_note/snippets_specLuke "Jared" Bennett2017-06-162-15/+37
| | | | | | | |
| * | | | | | | Pass more_actions_dropdown vie spec locals to render call instead of ↵Luke "Jared" Bennett2017-06-161-44/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stubbing them
| * | | | | | | Add view spec for more_actions_dropdown render branchesLuke "Jared" Bennett2017-06-161-0/+70
| | | | | | | |
* | | | | | | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-203-0/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ProjectsFinder#init_collection and GroupProjectsFinder#init_collection Closes #33632 See merge request !12135
| * | | | | | | | Refactor GroupProjectsFinder#init_collectionYorick Peterse2017-06-191-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This optimises how GroupProjectsFinder builds it collection, producing simpler and faster queries in the process. It also cleans up the code a bit to make it easier to understand.
| * | | | | | | | Refactor Project.with_feature_available_for_userYorick Peterse2017-06-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method used to use a UNION, which would lead to it performing the same query twice; producing less than ideal performance. Further, in certain cases ActiveRecord could get confused and mess up the variable bindings, though it's not clear how/why exactly this happens. Fortunately we can work around all of this by building some of the WHERE conditions manually, allowing us to use a simple OR statement to get all the data we want without any of the above problems.
| * | | | | | | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-161-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes ProjectsFinder#init_collection so it no longer relies on a UNION. For example, to get starred projects of a user we used to run: SELECT projects.* FROM projects WHERE projects.pending_delete = 'f' AND ( projects.id IN ( SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id INNER JOIN project_authorizations ON projects.id = project_authorizations.project_id WHERE projects.pending_delete = 'f' AND project_authorizations.user_id = 1 AND users_star_projects.user_id = 1 UNION SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.visibility_level IN (20, 10) AND users_star_projects.user_id = 1 ) ) ORDER BY projects.id DESC; With these changes the above query is turned into the following instead: SELECT projects.* FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.pending_delete = 'f' AND ( EXISTS ( SELECT 1 FROM project_authorizations WHERE project_authorizations.user_id = 1 AND (project_id = projects.id) ) OR projects.visibility_level IN (20,10) ) AND users_star_projects.user_id = 1 ORDER BY projects.id DESC; This query in turn produces a better execution plan and takes less time, though the difference is only a few milliseconds (this however depends on the amount of data involved and additional conditions that may be added).
* | | | | | | | | Uniformize code between both pipelines tablesFilipa Lacerda2017-06-206-86/+25
| | | | | | | | |
* | | | | | | | | Re-instate is_admin flag in users API is current user is an adminMike Ricketts2017-06-202-1/+40
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' ↵Sean McGivern2017-06-201-0/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Do not enable prometheus metrics when metrics folder is missing See merge request !12263
| * | | | | | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-0/+30
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Set defaults correctly only for when not in production or staging + set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru Test prometheus metrics unmemoized
* | | | | | | | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-202-13/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove backticks from chat messages because they're not rendered as code See merge request !12276
| * | | | | | | | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticksDouwe Maan2017-06-192-13/+13
| | | | | | | | |
* | | | | | | | | Stop showing task status if no tasks are presentPhil Hughes2017-06-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the task status would be visible even if there where no tasks in the description. This fixes that by changing the regex to check for tasks without 0. This also fixes a bug where update the description inline would not update the task status text on screen. Closes #33880
* | | | | | | | | Clean up Vue warnings in testsWinnie Hellmann2017-06-206-2/+33
| | | | | | | | |
* | | | | | | | | Resolve "Transient karma failure on master for `Date time utils timeFor ↵Mike Greiling2017-06-201-0/+4
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | returns remaining time when in the future`"
* | | | | | | | Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'Phil Hughes2017-06-201-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note highlight being added when you don't have a URL fragment hash #note_xxx Closes #33916 See merge request !12293
| * | | | | | | | Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcitEric Eastwood2017-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use a explicit true/false value to set highlight because jQuery assumes `null` means toggle from whatever state and doesn't force false. Regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12098
* | | | | | | | | Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'Phil Hughes2017-06-201-0/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue description syntax highlighting and math rendering Closes #33877 See merge request !12282
| * | | | | | | | | Fix issue description syntax highlighting and math rendering33877-fix-issue-description-highlight-and-mathEric Eastwood2017-06-191-0/+16
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33877 Regressed in https://gitlab.com/gitlab-org/gitlab-ce/commit/5a95d6f8dae00b31b694759c6ddbf6d83b1a7890#3a15290e7696397415523e0b664aceb3dd4010ae_0_46 where the ref no longer matches what we call `renderGFM` on.
* | | | | | | | | Remove implicit dependency on `gitlab_sign_in` assigning `@user`rs-login_asRobert Speicher2017-06-196-66/+72
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't be using instance variables in specs to begin with, and depending on this implicit behavior of `gitlab_sign_in` would have made it more difficult to change to `sign_in` where possible. ...we've also gone ahead and changed to `sign_in` where possible.
* | | | | | | | Merge branch 'rs-gitlab_sign_in' into 'master'Douwe Maan2017-06-20302-464/+467
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for bypassing GitLab sign in in feature specs See merge request !11913
| * | | | | | | | Fix failure in spec/features/unsubscribe_links_spec.rbRobert Speicher2017-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure why this fails with the full login flow, but it's not necessary and would've been changed eventually anyway, so whatever!
| * | | | | | | | Include Devise::Test::IntegrationHelpers for all feature specsRobert Speicher2017-06-191-0/+1
| | | | | | | | |
| * | | | | | | | Change `logout` uses to `gitlab_sign_out`Robert Speicher2017-06-1910-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change `logout_direct` uses to `gitlab_sign_out_direct`
| * | | | | | | | Change `login_with` uses to `gitlab_sign_in`Robert Speicher2017-06-1921-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change single `login_via` use to `gitlab_sign_in_via`
| * | | | | | | | Change `login_as` uses to `gitlab_sign_in`Robert Speicher2017-06-19287-367/+364
| | | | | | | | |
| * | | | | | | | Rename methods in the LoginHelpers moduleRobert Speicher2017-06-191-26/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - [x] Rename `login_as` to `gitlab_sign_in` - [x] Rename `login_with` to `gitlab_sign_in_with` - [x] Rename `login_via` to `gitlab_sign_in_via` - [x] Rename `logout` to `gitlab_sign_out` - [x] Rename `logout_direct` to `gitlab_sign_out_direct` - [x] Make `gitlab_login_with` (née `login_with`) private - [x] Make `mock_auth_hash` private