summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add `.find` polyadd-find-polyLuke "Jared" Bennett2016-11-254-31/+70
* Merge branch 'zj-slash-commands-improvements' into 'master' 24769-make-mattermost-command-easier-to-configureKamil Trzciński2016-11-252-1/+9
|\
| * Accept a valid ref for issue showZ.J. van de Weg2016-11-252-1/+9
* | Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse2016-11-258-12/+32
|\ \
| * | API: Introduce `#find_group!` which also check access permission22373-reduce-queries-in-api-helpers-find_projectRémy Coutable2016-11-244-7/+15
| * | API: Introduce `#find_project!` which also check access permissionRémy Coutable2016-11-242-8/+11
| * | API: Use `#find_project` in API::Triggers and API::ServicesRémy Coutable2016-11-242-2/+2
| * | Make API::Helpers find a project with only one queryRémy Coutable2016-11-242-1/+10
* | | Merge branch 'fix-cancelling-pipelines' into 'master' Kamil Trzciński2016-11-258-10/+288
|\ \ \
| * | | Wrap against 80 chars and rename failed_or_canceledfix-cancelling-pipelinesLin Jen-Shin2016-11-231-7/+9
| * | | Expand the loop and reduce overlapped conditionsLin Jen-Shin2016-11-221-12/+30
| * | | Passing a user to retry_failed in testsLin Jen-Shin2016-11-221-3/+3
| * | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-22167-1152/+4241
| |\ \ \
| * | | | Test against all possible cases, feedback:Lin Jen-Shin2016-11-221-14/+17
| * | | | Test against all types and more status:Lin Jen-Shin2016-11-211-37/+45
| * | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-21305-1386/+7560
| |\ \ \ \
| * | | | | Prefer a description for it and split the case:Lin Jen-Shin2016-11-212-32/+51
| * | | | | Allow to retry failed or canceled builds and fix cancel running specs failureKamil Trzcinski2016-11-193-9/+69
| * | | | | Add a test for Ci::Pipeline#cancel_running:Lin Jen-Shin2016-11-191-0/+16
| * | | | | Add a lot of tests for scopes, feedback:Lin Jen-Shin2016-11-193-0/+85
| * | | | | Add tests against two jobs having different statusLin Jen-Shin2016-11-181-0/+12
| * | | | | Add when cancelling for external jobs, feedback:Lin Jen-Shin2016-11-181-0/+7
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-18359-1045/+3887
| |\ \ \ \ \
| * | | | | | Improve how we could cancel pipelines:Lin Jen-Shin2016-11-175-4/+52
* | | | | | | Merge branch 'autocomplete-space-prefix' into 'master' Fatih Acet2016-11-252-1/+76
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into autocomplete-space-prefixautocomplete-space-prefixPhil Hughes2016-11-241481-16085/+30504
| |\ \ \ \ \ \ \
| * | | | | | | | Tests fixPhil Hughes2016-11-141-2/+2
| * | | | | | | | Merge branch 'master' into autocomplete-space-prefixPhil Hughes2016-11-112480-25206/+73303
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into autocomplete-space-prefixPhil Hughes2016-08-301869-26998/+71673
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correctly checks for character before GFM input charPhil Hughes2016-07-212-3/+38
| * | | | | | | | | | Allow GFM autocomplete to be trigger without the preceding spacePhil Hughes2016-07-212-0/+30
* | | | | | | | | | | Merge branch 'issue_24748' into 'master' Fatih Acet2016-11-257-11/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Fix title case to sentence caseLuis Alonso Chavez Armendariz2016-11-237-11/+15
* | | | | | | | | | | Merge branch 'issue_24958' into 'master' Rémy Coutable2016-11-252-3/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix bad selection on dropdown menu for tags filterLuis Alonso Chavez Armendariz2016-11-252-3/+8
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'rephrase-system-notes' into 'master' Robert Speicher2016-11-2523-124/+169
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-2423-124/+169
* | | | | | | | | | | | Merge branch 'fix/invalid-storage-cleanup-affecting-test-suite' into 'master' Robert Speicher2016-11-252-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Clear test build storage directory before each examplefix/invalid-storage-cleanup-affecting-test-suiteGrzegorz Bizon2016-11-231-2/+3
| * | | | | | | | | | | | Remove entire test files directory for test buildsGrzegorz Bizon2016-11-231-7/+5
| * | | | | | | | | | | | Clear Carrierwave upload after each test exampleGrzegorz Bizon2016-11-231-1/+1
| * | | | | | | | | | | | Clean build storage after each RSpec test exampleGrzegorz Bizon2016-11-231-2/+2
* | | | | | | | | | | | | Merge branch 'zj-upgrade-grape' into 'master' Robert Speicher2016-11-257-19/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove tests which do not add valuezj-upgrade-grapeZ.J. van de Weg2016-11-233-12/+0
| * | | | | | | | | | | | | Upgrade grape-entity to 0.6.0Z.J. van de Weg2016-11-234-8/+5
| * | | | | | | | | | | | | Add changelog entry for grape-entity upgradeZ.J. van de Weg2016-11-211-0/+4
| * | | | | | | | | | | | | Upgrade grape-entityZ.J. van de Weg2016-11-212-4/+3
* | | | | | | | | | | | | | Merge branch '24780-show-last-updated-or-resolved-in-mr-discussion' into 'mas...Fatih Acet2016-11-242-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | resloves failed rspec test24780-show-last-updated-or-resolved-in-mr-discussionNur Rony2016-11-231-1/+1
| * | | | | | | | | | | | | | resolves updated and resolved status is not showinNur Rony2016-11-231-0/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |