summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-19164-1126/+4332
|\
| * Merge branch '22782-external-link-filter-with-non-lowercase-scheme' into 'mas...Sean McGivern2016-10-181-0/+34
| |\
| | * Add Nofollow for uppercased scheme in external urlthe-undefined2016-10-181-0/+34
| * | Merge branch 'dz-spinach-wait-ajax' into 'master' Dmitriy Zaporozhets2016-10-181-0/+4
| |\ \
| | * | Wait for ajax for every merge request spinach testdz-spinach-wait-ajaxDmitriy Zaporozhets2016-10-181-0/+4
| * | | Merge branch '23311-fix-double-escaping' into 'master' Sean McGivern2016-10-181-0/+17
| |\ \ \
| | * | | Stop event_commit_title from escaping its outputNick Thomas2016-10-181-0/+17
| * | | | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-185-2/+273
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-1816-74/+706
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-1726-65/+494
| | |\ \ \ \
| | * | | | | Just show the first merge request we found, feedback:Lin Jen-Shin2016-10-142-39/+0
| | * | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-14101-877/+2166
| | |\ \ \ \ \
| | * | | | | | Introduce Pipeline#merge_requests_with_active_first,Lin Jen-Shin2016-10-142-1/+40
| | * | | | | | Space between subject and {, feedback:Lin Jen-Shin2016-10-141-0/+1
| | * | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0891-345/+2854
| | |\ \ \ \ \ \
| | * | | | | | | Fix tests for subject updatesLin Jen-Shin2016-10-081-2/+2
| | * | | | | | | Add pipeline_email_service. Fixes:Lin Jen-Shin2016-10-041-1/+2
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-04132-897/+3841
| | |\ \ \ \ \ \ \
| | * | | | | | | | Not sure why I missed thisLin Jen-Shin2016-09-231-1/+5
| | * | | | | | | | Cleanup emails between testsLin Jen-Shin2016-09-231-0/+4
| | * | | | | | | | Fix the other missing commitLin Jen-Shin2016-09-231-1/+5
| | * | | | | | | | Fix test by having a real commitLin Jen-Shin2016-09-231-1/+5
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2173-204/+3143
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Make various trace methods take last_lines argument:Lin Jen-Shin2016-09-211-0/+40
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-191-0/+4
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1955-799/+724
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1417-53/+387
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | test for realLin Jen-Shin2016-09-141-34/+82
| | * | | | | | | | | | | | Split notification integration into another branchLin Jen-Shin2016-09-141-1/+1
| | * | | | | | | | | | | | Fix pipeline emails and add testsLin Jen-Shin2016-09-142-0/+165
| * | | | | | | | | | | | | Merge branch '21192-retried-builds' into 'master' Jacob Schatz2016-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Remove unnecessary retried check & fix test failuresAnnabel Dunstone Gray2016-10-181-1/+1
| * | | | | | | | | | | | | | Merge branch 'login-fixups' into 'master' Rémy Coutable2016-10-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix login tests for crowd to use #crowd.Bryce Johnson2016-10-181-2/+2
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'fix/pipeline-settings-page' into 'master' Kamil Trzciński2016-10-181-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Move specs for project pipeline settings pageGrzegorz Bizon2016-10-181-0/+0
| | * | | | | | | | | | | | | Reload pipeline settings when saving new settingsGrzegorz Bizon2016-10-181-1/+2
| * | | | | | | | | | | | | | Merge branch 'retry-cancelled-pipelines' into 'master' Kamil Trzciński2016-10-181-5/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into retry-cancelled-pipelinesretry-cancelled-pipelinesLin Jen-Shin2016-10-1816-74/+706
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Make cancelled pipelines being able to retryLin Jen-Shin2016-10-171-5/+19
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'issue_19734_2' into 'master' Sean McGivern2016-10-185-1/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into issue_19734_2Phil Hughes2016-10-188-53/+606
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-175-1/+95
| * | | | | | | | | | | | | Merge branch 'looser-time-in-specs' into 'master' Douwe Maan2016-10-188-14/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Add a be_like_time matcher and use it in specsNick Thomas2016-10-178-14/+27
| * | | | | | | | | | | | | Merge branch 'fix/build-erase-race-condition' into 'master' Kamil Trzciński2016-10-181-12/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Avoid race condition when expiring artifactsGrzegorz Bizon2016-10-171-12/+32
| * | | | | | | | | | | | | Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-187-41/+574
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-177-27/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-1737-129/+682
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |