summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitaly-auth-token' into 'master'Sean McGivern2017-06-215-11/+16
|\
| * 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 MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editingEric Eastwood2017-06-202-32/+77
* | | Merge branch '30213-project-transfer-move-rollback' into 'master'Douwe Maan2017-06-201-0/+61
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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 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
|\ \ \ \ \ \
| * | | | | | 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 stubbing...Luke "Jared" Bennett2017-06-161-44/+15
| * | | | | | 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 GroupProjectsFinder#init_collectionYorick Peterse2017-06-191-0/+32
| * | | | | | | Refactor Project.with_feature_available_for_userYorick Peterse2017-06-161-0/+12
| * | | | | | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-161-0/+31
* | | | | | | | 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' in...Sean McGivern2017-06-201-0/+30
|\ \ \ \ \ \ \
| * | | | | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-0/+30
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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 codedm-chat-message-backticksDouwe Maan2017-06-192-13/+13
* | | | | | | | Stop showing task status if no tasks are presentPhil Hughes2017-06-201-0/+12
* | | | | | | | Clean up Vue warnings in testsWinnie Hellmann2017-06-206-2/+33
* | | | | | | | Resolve "Transient karma failure on master for `Date time utils timeFor retur...Mike Greiling2017-06-201-0/+4
* | | | | | | | Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'Phil Hughes2017-06-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcitEric Eastwood2017-06-191-1/+1
* | | | | | | | | Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'Phil Hughes2017-06-201-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue description syntax highlighting and math rendering33877-fix-issue-description-highlight-and-mathEric Eastwood2017-06-191-0/+16
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Remove implicit dependency on `gitlab_sign_in` assigning `@user`rs-login_asRobert Speicher2017-06-196-66/+72
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'rs-gitlab_sign_in' into 'master'Douwe Maan2017-06-20302-464/+467
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix failure in spec/features/unsubscribe_links_spec.rbRobert Speicher2017-06-191-1/+1
| * | | | | | | | 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 `login_with` uses to `gitlab_sign_in`Robert Speicher2017-06-1921-54/+54
| * | | | | | | | 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
* | | | | | | | | Merge branch 'enable-autocomplete-on-project-snippets' into 'master'Jacob Schatz2017-06-191-11/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Enable autocomplete on project snippetsenable-autocomplete-on-project-snippetsEric Eastwood2017-06-191-11/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-194-85/+196
|/ / / / / / /
* | | | | | | Merge branch '33598-fix-autocomplete-disabled-in-gl-form-instances' into 'mas...Jacob Schatz2017-06-197-41/+140
|\ \ \ \ \ \ \
| * | | | | | | Re-enable autocomplete for milestones, tags, releases, and wikiEric Eastwood2017-06-197-41/+140
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'Clement Ho2017-06-192-1/+40
|\ \ \ \ \ \ \
| * | | | | | | Disable autocomplete on snippets commentsEric Eastwood2017-06-192-1/+40
| |/ / / / / /