| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix merge requests feature testsfix-merge-request-diff-spinach-failures | Dmitriy Zaporozhets | 2016-10-16 | 1 | -1/+5 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Wait for ajax call in merge request unsubscribe test | Dmitriy Zaporozhets | 2016-10-16 | 1 | -0/+2 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix Spinach merge request diff failures | Stan Hu | 2016-10-15 | 2 | -3/+5 |
| | | | | | | | | | gitlab-git-test `master` was updated in ff076d88, and this caused the merge request diffs to change in a way that broke assumptions in the Spinach tests. Partial fix to #23378 | ||||
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce | Jacob Schatz | 2016-10-15 | 4 | -10/+18 |
| |\ | |||||
| | * | Merge branch 'dz-handle-unmatched-routes' into 'master' | Dmitriy Zaporozhets | 2016-10-15 | 3 | -2/+9 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle unmatched routing with not_found method ## What does this MR do? Handle all unmatched routes with 404 method ## Why was this MR needed? We need this to prevent routing error when user access URL like /123 when there is no resource located under such name. ## What are the relevant issue numbers? Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6733. See merge request !6905 | ||||
| | | * | Revert "Update git over http test to match new routing"dz-handle-unmatched-routes | Dmitriy Zaporozhets | 2016-10-15 | 1 | -2/+3 |
| | | | | | | | | | | | | | This reverts commit 68ab7047dae98172a0bd8b92956f2ee51b9167a0. | ||||
| | | * | Handle unmatched routing with not_found method | Dmitriy Zaporozhets | 2016-10-15 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | We need this to prevent routing error when user access URL like /123 when there is no resource located under such name Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Merge branch 'dz-fix-extract-path' into 'master' | Dmitriy Zaporozhets | 2016-10-15 | 1 | -8/+9 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ExtractsPath logic related to atom format * Fixes one test from https://gitlab.com/gitlab-org/gitlab-ce/issues/23378. * Fixes issue introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6750. See merge request !6907 | ||||
| | | * | | Improve ExtractsPath logic related to atom formatdz-fix-extract-path | Dmitriy Zaporozhets | 2016-10-15 | 1 | -8/+9 |
| | | |/ | | | | | | | | | | | | | | | | | | | * Don't set request format to atom if '.atom' suffix was not provided * Don't try '.atom' detection logic on request that uses extended_sha1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Merge branch 'master' into login-ui-improvements | Jacob Schatz | 2016-10-15 | 2 | -3/+3 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'remove-ashley' into 'master' | Stan Hu | 2016-10-15 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove ashley since she no longer works here ## What does this MR do? Merges gitlab-org/gitlab-ee!803 in the right place. This was already merged in EE because I sent the MR there by accident. See merge request !6913 | ||||
| | | * | | remove ashley since she no longer works here | De Wet Blomerus | 2016-10-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'fix-language-spinach-failure' into 'master' | Robert Speicher | 2016-10-15 | 1 | -2/+2 |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Spinach failure due overprecise percentage matching The percentages in the language match changed by a tenth of a percentage point for Ruby and JavaScript, which led to this failure. Partial fix to #23378 See merge request !6912 | ||||
| | | * | | Fix Spinach failure due overprecise percentage matchingfix-language-spinach-failure | Stan Hu | 2016-10-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The percentages in the language match changed by a tenth of a percentage point for Ruby and JavaScript, which led to this failure. Partial fix to #23378 | ||||
| * | | | | Revert "Improve tabbing usability for sign in page"login-ui-improvements | Bryce Johnson | 2016-10-15 | 1 | -10/+0 |
| | | | | | | | | | | | | | | | | | This reverts commit 8751491b8db471dc661daa19bc82a9dbd58e4aae. | ||||
| * | | | | Don't use member properties in users_spec, and remove loading ref. | Bryce Johnson | 2016-10-15 | 1 | -5/+2 |
| | | | | | |||||
| * | | | | Clean up stray Sign up ref. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Back off the array spreading, bc poltergeist freaks out. | Bryce Johnson | 2016-10-15 | 2 | -7/+6 |
| | | | | | |||||
| * | | | | Convert dispatcher to es6. | Bryce Johnson | 2016-10-15 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Add exists to users routes and fix endpoint. | Bryce Johnson | 2016-10-15 | 2 | -1/+2 |
| | | | | | |||||
| * | | | | Attempt to fix username validation ruby. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Clean up layouts/devise.html. | Bryce Johnson | 2016-10-15 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Use Ruby 1.9 syntax in tab_single def and usage. | Bryce Johnson | 2016-10-15 | 7 | -8/+7 |
| | | | | | |||||
| * | | | | Fixup invalid refs. | Bryce Johnson | 2016-10-15 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Convert field error NodeList to an Array. | Bryce Johnson | 2016-10-15 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Revert conflict resolution in routes.rb. | Bryce Johnson | 2016-10-15 | 1 | -792/+0 |
| | | | | | |||||
| * | | | | Use native dom in dispatcher field error init. | Bryce Johnson | 2016-10-15 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Improve method naming in gl_field_errors. | Bryce Johnson | 2016-10-15 | 1 | -21/+22 |
| | | | | | |||||
| * | | | | Stringify username before passing to ActiveRecord. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add accessor for current val for convenience. | Bryce Johnson | 2016-10-15 | 1 | -5/+9 |
| | | | | | |||||
| * | | | | Safely scope siblings of validated input. | Bryce Johnson | 2016-10-15 | 1 | -2/+15 |
| | | | | | |||||
| * | | | | Remove superfluous comment. | Bryce Johnson | 2016-10-15 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Prevent unneccessary loading of UsernameValidator. | Bryce Johnson | 2016-10-15 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Update filled in field for two_factor auth to use id. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix syntax error -- missing comma in _new_crowd. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix nesting on sessions/new. | Bryce Johnson | 2016-10-15 | 2 | -9/+8 |
| | | | | | |||||
| * | | | | Click first Sign In in login_helper. | Bryce Johnson | 2016-10-15 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Unbreak all the tests relying on one login-box. | Bryce Johnson | 2016-10-15 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Add tests for gl_field_errors. | Bryce Johnson | 2016-10-15 | 2 | -0/+126 |
| | | | | | |||||
| * | | | | Properly implement focus on first invalid. | Bryce Johnson | 2016-10-15 | 1 | -11/+6 |
| | | | | | |||||
| * | | | | Fix omniauth box styling. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Shush rubocop. | Bryce Johnson | 2016-10-15 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add third box shadow to validation focus, for depth. | Bryce Johnson | 2016-10-15 | 1 | -53/+37 |
| | | | | | |||||
| * | | | | Add submit button contain with custom margin. | Bryce Johnson | 2016-10-15 | 3 | -2/+6 |
| | | | | | |||||
| * | | | | Make style fixes, make all submit buttons full-width btn-block. | Bryce Johnson | 2016-10-15 | 2 | -2/+7 |
| | | | | | |||||
| * | | | | Include correct validation error with username invalid. | Bryce Johnson | 2016-10-15 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Get tests passing. | Bryce Johnson | 2016-10-15 | 2 | -5/+8 |
| | | | | | |||||
| * | | | | Fix errors, get validation running for signup box and sign in. | Bryce Johnson | 2016-10-15 | 3 | -28/+38 |
| | | | | | |||||
| * | | | | Refactor gl field errors for simpler state management. | Bryce Johnson | 2016-10-15 | 1 | -45/+89 |
| | | | | | |||||
| * | | | | Clean up username_validator private vars and members. | Bryce Johnson | 2016-10-15 | 1 | -44/+47 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |