summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'notebooklab-in-repo' into 'master' Jacob Schatz2017-04-248-1/+417
|\
| * Merge branch 'master' into notebooklab-in-reponotebooklab-in-repoPhil Hughes2017-04-1310-97/+223
| |\
| * \ Merge branch 'master' into notebooklab-in-repoPhil Hughes2017-04-1329-328/+1048
| |\ \
| * | | Pull in fixture files from the repoPhil Hughes2017-04-116-7/+49
| * | | Moved NotebookLab assets into repoPhil Hughes2017-04-116-0/+374
* | | | Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-241-0/+15
|\ \ \ \
| * | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-urlStan Hu2017-04-241-0/+15
* | | | | Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' Sean McGivern2017-04-241-7/+2
|\ \ \ \ \
| * | | | | Fix commenting on an existing discussion on an unchanged line that is no long...Douwe Maan2017-04-241-7/+2
| |/ / / /
* | | | | Merge branch '30305-oauth-token-push-code' into 'master' Rémy Coutable2017-04-242-3/+3
|\ \ \ \ \
| * | | | | Allow OAuth clients to push code30305-oauth-token-push-codeTimothy Andrew2017-04-132-3/+3
* | | | | | Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'Rémy Coutable2017-04-24168-362/+87
|\ \ \ \ \ \
| * | | | | | Unnecessary "include WaitForAjax" and "include ApiHelpers"Jacopo2017-04-21169-364/+87
* | | | | | | Merge branch 'sh-optimize-duplicate-routable-full-path' into 'master' Sean McGivern2017-04-241-0/+18
|\ \ \ \ \ \ \
| * | | | | | | Cache Routable#full_path in RequestStore to reduce duplicate route loadssh-optimize-duplicate-routable-full-pathStan Hu2017-04-241-0/+18
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' Kamil Trzciński2017-04-243-31/+66
|\ \ \ \ \ \ \
| * | | | | | | Simplify specs and remove unnecessary attributestc-realtime-every-pipeline-on-mrToon Claes2017-04-242-13/+4
| * | | | | | | Refactor ExpirePipelineCacheWorker#performToon Claes2017-04-242-8/+16
| * | | | | | | Use a better performing query to find all MRs for pipelineToon Claes2017-04-242-1/+37
| * | | | | | | Properly expire cache for **all** MRs of a pipelineToon Claes2017-04-242-7/+7
| |/ / / / / /
* | | | | | | Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' Kamil Trzciński2017-04-241-20/+45
|\ \ \ \ \ \ \
| * | | | | | | Improve helpers in pipeline model specsGrzegorz Bizon2017-04-211-3/+3
| * | | | | | | Fix missing pipeline duration for blocked pipelinesGrzegorz Bizon2017-04-211-19/+44
* | | | | | | | Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' Kamil Trzciński2017-04-243-18/+85
|\ \ \ \ \ \ \ \
| * | | | | | | | Add specs for new ci status helper methodGrzegorz Bizon2017-04-211-9/+38
| * | | | | | | | Fix lastest commit status text on main project pageGrzegorz Bizon2017-04-212-9/+47
* | | | | | | | | Merge branch 'rs-empty-project-features' into 'master' Rémy Coutable2017-04-2418-44/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use `:empty_project` where possible in top-level feature specsrs-empty-project-featuresRobert Speicher2017-04-2018-44/+56
* | | | | | | | | | Merge branch 'dz-fix-spec-filenames-ce' into 'master' Sean McGivern2017-04-245-51/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix outdated specs that were not executed due to wrong filenameDmitriy Zaporozhets2017-04-242-4/+6
| * | | | | | | | | | Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ceDmitriy Zaporozhets2017-04-245-47/+40
* | | | | | | | | | | Merge branch '29335-fix-request-access-button-visibility' into 'master' Douwe Maan2017-04-241-0/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added test to prevent ‘Request access’ regression29335-fix-request-access-button-visibilityJames Edwards-Jones2017-04-221-0/+11
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mrchrisw-22740-merge-api' into 'master' Sean McGivern2017-04-241-1/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-apiChris Wilson2017-04-241-1/+13
* | | | | | | | | | | | Merge branch 'rs-rename-login_as' into 'master' Rémy Coutable2017-04-242-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Return early from `finished_all_ajax_requests?` when jQuery is undefinedrs-rename-login_asRobert Speicher2017-04-191-0/+1
| * | | | | | | | | | | Simplify the `javascript_test?` helperRobert Speicher2017-04-191-1/+3
| * | | | | | | | | | | Remove unused `skip_ci_admin_auth` helperRobert Speicher2017-04-191-4/+0
* | | | | | | | | | | | Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into 'mast...Yorick Peterse2017-04-242-0/+70
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Move records to the ghost user in a transaction.Timothy Andrew2017-04-242-0/+70
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'submodules-no-dotgit' into 'master' Dmitriy Zaporozhets2017-04-221-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | submodule_links: handle urls that don't end with .gitDavid Turner2017-04-211-4/+8
* | | | | | | | | | | Merge branch '30672-versioned-markdown-cache' into 'master' Douwe Maan2017-04-213-132/+211
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Start versioning cached markdown fieldsNick Thomas2017-04-213-122/+212
| * | | | | | | | | | | Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-211-14/+3
* | | | | | | | | | | | Merge branch 'dz-cleanup-add-users' into 'master' Douwe Maan2017-04-213-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Refactor add_users method for project and groupdz-cleanup-add-usersDmitriy Zaporozhets2017-04-213-3/+28
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'form-focus-previous-incorrect-form' into 'master' Filipa Lacerda2017-04-211-0/+45
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improved the specform-focus-previous-incorrect-formPhil Hughes2017-04-211-9/+25