summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'project-cache-worker-lease' into 'master' Rémy Coutable2016-10-201-10/+28
* Merge branch 'fix-label-api-spec' into 'master' Douwe Maan2016-10-201-2/+1
* Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-202-36/+18
* Merge branch 'sh-improve-merge-service-logging' into 'master' Robert Speicher2016-10-201-2/+2
* Merge branch 'sh-fix-broken-note-award-emoji' into 'master' Robert Speicher2016-10-201-5/+41
* Merge branch 'backport-git-access-spec-changes' into 'master' Douwe Maan2016-10-201-6/+6
* Merge branch 'dz-spinach-wait-ajax' into 'master' Dmitriy Zaporozhets2016-10-201-0/+4
* Merge branch 'fix-escaping' into 'master' Sean McGivern2016-10-201-0/+5
* Merge branch '23311-fix-double-escaping' into 'master' Sean McGivern2016-10-201-0/+17
* Merge branch 'issue_22944' into 'master' Sean McGivern2016-10-201-3/+11
* Merge branch 'fix-system-hook-api' into 'master' Rémy Coutable2016-10-201-3/+4
* Merge branch '22782-external-link-filter-with-non-lowercase-scheme' into 'mas...Sean McGivern2016-10-201-0/+34
* Merge branch 'issue_828' into 'master' Douwe Maan2016-10-208-63/+145
* Merge branch '22191-delete-dynamic-envs-mr' into 'master'Rémy Coutable2016-10-208-45/+415
* Merge branch 'feature/group-level-labels' into 'master'Douwe Maan2016-10-2032-156/+874
* Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-201-17/+41
* Merge branch '21192-retried-builds' into 'master' Jacob Schatz2016-10-201-1/+1
* Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-205-2/+273
* 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
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-132-0/+12
| * | | | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-132-49/+97
| * | | | Improve diff view switching and componentsAlfredo Sumaran2016-10-131-5/+5
| * | | | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-131-1/+37
| * | | | Refactor JS codeAlfredo Sumaran2016-10-131-2/+2
| * | | | Fix editor specSean McGivern2016-10-131-0/+1
| * | | | Add tests to check if files are resolved with Edit Inline modeAlfredo Sumaran2016-10-131-0/+26
| * | | | We now support resolving conflicts with ambiguous markersDouwe Maan2016-10-131-1/+0
| * | | | Add JSON SchemaSean McGivern2016-10-132-0/+141
| * | | | Fix resolve service specsSean McGivern2016-10-131-2/+2
| * | | | Fix MR model specSean McGivern2016-10-131-6/+6
| * | | | Fix specsSean McGivern2016-10-131-2/+2
| * | | | Make RuboCop happySean McGivern2016-10-131-1/+0
| * | | | Allow setting content for resolutionsSean McGivern2016-10-132-18/+289
View Lorry Controller Status