Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add `.find` polyadd-find-poly | Luke "Jared" Bennett | 2016-11-25 | 4 | -31/+70 |
* | Merge branch 'zj-slash-commands-improvements' into 'master' 24769-make-mattermost-command-easier-to-configure | Kamil Trzciński | 2016-11-25 | 2 | -1/+9 |
|\ | |||||
| * | Accept a valid ref for issue show | Z.J. van de Weg | 2016-11-25 | 2 | -1/+9 |
* | | Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' | Yorick Peterse | 2016-11-25 | 8 | -12/+32 |
|\ \ | |||||
| * | | API: Introduce `#find_group!` which also check access permission22373-reduce-queries-in-api-helpers-find_project | Rémy Coutable | 2016-11-24 | 4 | -7/+15 |
| * | | API: Introduce `#find_project!` which also check access permission | Rémy Coutable | 2016-11-24 | 2 | -8/+11 |
| * | | API: Use `#find_project` in API::Triggers and API::Services | Rémy Coutable | 2016-11-24 | 2 | -2/+2 |
| * | | Make API::Helpers find a project with only one query | Rémy Coutable | 2016-11-24 | 2 | -1/+10 |
* | | | Merge branch 'fix-cancelling-pipelines' into 'master' | Kamil Trzciński | 2016-11-25 | 8 | -10/+288 |
|\ \ \ | |||||
| * | | | Wrap against 80 chars and rename failed_or_canceledfix-cancelling-pipelines | Lin Jen-Shin | 2016-11-23 | 1 | -7/+9 |
| * | | | Expand the loop and reduce overlapped conditions | Lin Jen-Shin | 2016-11-22 | 1 | -12/+30 |
| * | | | Passing a user to retry_failed in tests | Lin Jen-Shin | 2016-11-22 | 1 | -3/+3 |
| * | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelines | Lin Jen-Shin | 2016-11-22 | 167 | -1152/+4241 |
| |\ \ \ | |||||
| * | | | | Test against all possible cases, feedback: | Lin Jen-Shin | 2016-11-22 | 1 | -14/+17 |
| * | | | | Test against all types and more status: | Lin Jen-Shin | 2016-11-21 | 1 | -37/+45 |
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelines | Lin Jen-Shin | 2016-11-21 | 305 | -1386/+7560 |
| |\ \ \ \ | |||||
| * | | | | | Prefer a description for it and split the case: | Lin Jen-Shin | 2016-11-21 | 2 | -32/+51 |
| * | | | | | Allow to retry failed or canceled builds and fix cancel running specs failure | Kamil Trzcinski | 2016-11-19 | 3 | -9/+69 |
| * | | | | | Add a test for Ci::Pipeline#cancel_running: | Lin Jen-Shin | 2016-11-19 | 1 | -0/+16 |
| * | | | | | Add a lot of tests for scopes, feedback: | Lin Jen-Shin | 2016-11-19 | 3 | -0/+85 |
| * | | | | | Add tests against two jobs having different status | Lin Jen-Shin | 2016-11-18 | 1 | -0/+12 |
| * | | | | | Add when cancelling for external jobs, feedback: | Lin Jen-Shin | 2016-11-18 | 1 | -0/+7 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelines | Lin Jen-Shin | 2016-11-18 | 359 | -1045/+3887 |
| |\ \ \ \ \ | |||||
| * | | | | | | Improve how we could cancel pipelines: | Lin Jen-Shin | 2016-11-17 | 5 | -4/+52 |
* | | | | | | | Merge branch 'autocomplete-space-prefix' into 'master' | Fatih Acet | 2016-11-25 | 2 | -1/+76 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into autocomplete-space-prefixautocomplete-space-prefix | Phil Hughes | 2016-11-24 | 1481 | -16085/+30504 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Tests fix | Phil Hughes | 2016-11-14 | 1 | -2/+2 |
| * | | | | | | | | Merge branch 'master' into autocomplete-space-prefix | Phil Hughes | 2016-11-11 | 2480 | -25206/+73303 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into autocomplete-space-prefix | Phil Hughes | 2016-08-30 | 1869 | -26998/+71673 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Correctly checks for character before GFM input char | Phil Hughes | 2016-07-21 | 2 | -3/+38 |
| * | | | | | | | | | | Allow GFM autocomplete to be trigger without the preceding space | Phil Hughes | 2016-07-21 | 2 | -0/+30 |
* | | | | | | | | | | | Merge branch 'issue_24748' into 'master' | Fatih Acet | 2016-11-25 | 7 | -11/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix title case to sentence case | Luis Alonso Chavez Armendariz | 2016-11-23 | 7 | -11/+15 |
* | | | | | | | | | | | Merge branch 'issue_24958' into 'master' | Rémy Coutable | 2016-11-25 | 2 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix bad selection on dropdown menu for tags filter | Luis Alonso Chavez Armendariz | 2016-11-25 | 2 | -3/+8 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'rephrase-system-notes' into 'master' | Robert Speicher | 2016-11-25 | 23 | -124/+169 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Rephrase some system notes to be compatible with new system note stylerephrase-system-notes | Douwe Maan | 2016-11-24 | 23 | -124/+169 |
* | | | | | | | | | | | | Merge branch 'fix/invalid-storage-cleanup-affecting-test-suite' into 'master' | Robert Speicher | 2016-11-25 | 2 | -10/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Clear test build storage directory before each examplefix/invalid-storage-cleanup-affecting-test-suite | Grzegorz Bizon | 2016-11-23 | 1 | -2/+3 |
| * | | | | | | | | | | | | Remove entire test files directory for test builds | Grzegorz Bizon | 2016-11-23 | 1 | -7/+5 |
| * | | | | | | | | | | | | Clear Carrierwave upload after each test example | Grzegorz Bizon | 2016-11-23 | 1 | -1/+1 |
| * | | | | | | | | | | | | Clean build storage after each RSpec test example | Grzegorz Bizon | 2016-11-23 | 1 | -2/+2 |
* | | | | | | | | | | | | | Merge branch 'zj-upgrade-grape' into 'master' | Robert Speicher | 2016-11-25 | 7 | -19/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Remove tests which do not add valuezj-upgrade-grape | Z.J. van de Weg | 2016-11-23 | 3 | -12/+0 |
| * | | | | | | | | | | | | | Upgrade grape-entity to 0.6.0 | Z.J. van de Weg | 2016-11-23 | 4 | -8/+5 |
| * | | | | | | | | | | | | | Add changelog entry for grape-entity upgrade | Z.J. van de Weg | 2016-11-21 | 1 | -0/+4 |
| * | | | | | | | | | | | | | Upgrade grape-entity | Z.J. van de Weg | 2016-11-21 | 2 | -4/+3 |
* | | | | | | | | | | | | | | Merge branch '24780-show-last-updated-or-resolved-in-mr-discussion' into 'mas... | Fatih Acet | 2016-11-24 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | resloves failed rspec test24780-show-last-updated-or-resolved-in-mr-discussion | Nur Rony | 2016-11-23 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | resolves updated and resolved status is not showin | Nur Rony | 2016-11-23 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | |