Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-notify-mailer-specs' into 'master' | Rémy Coutable | 2017-03-23 | 3 | -309/+221 |
|\ | |||||
| * | Combine redundant `it` blocks in Notify spec | Robert Speicher | 2017-03-21 | 1 | -231/+149 |
| * | Miscellaneous cleanup of Notify shared examples | Robert Speicher | 2017-03-21 | 1 | -56/+64 |
| * | Remove the 'custom subject suffix' spec from a shared example | Robert Speicher | 2017-03-21 | 1 | -10/+0 |
| * | Move the `a new user email` shared example to the Emails::Profile spec | Robert Speicher | 2017-03-21 | 2 | -14/+10 |
* | | Return 404 if deploy key cannot be found in Projects::DeployKeysController#di... | Adam Niedzielski | 2017-03-23 | 1 | -0/+26 |
* | | Merge branch 'remove-cookies-global' into 'master' | Filipa Lacerda | 2017-03-23 | 3 | -11/+10 |
|\ \ | |||||
| * | | fix test failures | Mike Greiling | 2017-03-22 | 1 | -2/+1 |
| * | | remove Cookies class from global space | Mike Greiling | 2017-03-22 | 3 | -10/+10 |
* | | | Merge branch 'filter-bar-fix-ie' into 'master' | Filipa Lacerda | 2017-03-23 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixed search spec | Phil Hughes | 2017-03-23 | 1 | -1/+1 |
* | | | | Merge branch 'zj-chat-notification-default-branch' into 'master' | Rémy Coutable | 2017-03-23 | 2 | -0/+20 |
|\ \ \ \ | |||||
| * | | | | Improve readability and add test | Z.J. van de Weg | 2017-03-23 | 2 | -0/+20 |
* | | | | | Merge branch '24215-closed-issues-board' into 'master' | Sean McGivern | 2017-03-23 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Display all closed issues in “done” board list | Jarka Kadlecova | 2017-03-23 | 1 | -1/+2 |
* | | | | | | Merge branch '28307-fix-sporadic-feature-spec-failures' into 'master' | Sean McGivern | 2017-03-23 | 3 | -68/+62 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix spec/features/participants_autocomplete_spec.rb | Rémy Coutable | 2017-03-22 | 1 | -67/+28 |
| * | | | | | | Don't navigate to about:blank | Rémy Coutable | 2017-03-22 | 1 | -8/+0 |
| * | | | | | | Only include WaitForAjax for :js specs | Rémy Coutable | 2017-03-22 | 1 | -1/+1 |
| * | | | | | | Introduce a new middleware for the test environment that can block requests | Rémy Coutable | 2017-03-22 | 2 | -0/+41 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch '29823-fix-transient-failure' into 'master' | Sean McGivern | 2017-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use match_array instead of eq when order is irrelevant | Rémy Coutable | 2017-03-22 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch '29575-polling' into 'master' | Fatih Acet | 2017-03-23 | 1 | -0/+127 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | simplifies assignment of default options | Filipa Lacerda | 2017-03-22 | 1 | -0/+2 |
| * | | | | | Adds tests and changes after review | Filipa Lacerda | 2017-03-21 | 1 | -0/+125 |
* | | | | | | Merge branch 'fix_some_random_failures' into 'master' | Rémy Coutable | 2017-03-22 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix some random failures | Valery Sizov | 2017-03-22 | 1 | -0/+2 |
* | | | | | | Merge branch 'profile-project-pagination-json-fix' into 'master' | Jacob Schatz | 2017-03-22 | 1 | -0/+31 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed pagination in projects & snippets on user page | Phil Hughes | 2017-03-18 | 1 | -0/+31 |
* | | | | | | | Merge branch '29775-route-changes' into 'master' | Sean McGivern | 2017-03-22 | 3 | -9/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add spec that tests ‘LIKE’ query for routes with _ | Jarka Kadlecova | 2017-03-22 | 1 | -1/+3 |
| * | | | | | | | Remove not necessary specs | Jarka Kadlecova | 2017-03-22 | 2 | -8/+0 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch '29483-spam-check-only-title-and-description' into 'master' | Sean McGivern | 2017-03-22 | 4 | -26/+148 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Spam check only when spammable attributes have changed | Oswaldo Ferreira | 2017-03-21 | 3 | -23/+128 |
| * | | | | | | | Present ajax call errors when failing to update an Issue | Oswaldo Ferreira | 2017-03-21 | 1 | -3/+20 |
* | | | | | | | | Merge branch 'add-todos-shortcut' into 'master' | Sean McGivern | 2017-03-22 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add global `g t` shortcut to go to todos | Sean McGivern | 2017-03-17 | 1 | -0/+5 |
* | | | | | | | | Merge branch 'resolve-global-vue' into 'master' | Filipa Lacerda | 2017-03-21 | 8 | -11/+12 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | fix wait_for_vue_resource to not rely on global Vue object | Mike Greiling | 2017-03-20 | 1 | -1/+1 |
| * | | | | | | | remove Vue from the global space | Mike Greiling | 2017-03-20 | 7 | -10/+11 |
* | | | | | | | | Merge branch 'revert-37328406' into 'master' | Rémy Coutable | 2017-03-21 | 2 | -35/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "Merge branch '29534-todos-performance' into 'master'" | Sean McGivern | 2017-03-21 | 2 | -35/+0 |
* | | | | | | | | | Merge branch '29583-routes-like-fix' into 'master' | Sean McGivern | 2017-03-21 | 2 | -4/+31 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Escape route path for LIKE queries | Jarka Kadlecova | 2017-03-21 | 2 | -4/+31 |
* | | | | | | | | | Merge branch 'jej-backport-authorless-fix' into 'master' | Douwe Maan | 2017-03-21 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Prevented error on nil author from Issuable delegation | James Edwards-Jones | 2017-03-21 | 1 | -0/+28 |
* | | | | | | | | | | Resolve "Fix the Prometheus queries for multiple container environments" | Jose Ivan Vargas Lopez | 2017-03-21 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'sh-fix-issue-29739' into 'master' | Sean McGivern | 2017-03-21 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix Error 500 when Bitbucket importer does not have authorization | Stan Hu | 2017-03-20 | 1 | -0/+11 |
* | | | | | | | | | | | Merge branch 'gitaly-install-rake' into 'master' | Robert Speicher | 2017-03-21 | 2 | -3/+78 |
|\ \ \ \ \ \ \ \ \ \ \ |