summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/cycle-analytics-no-data' into 'master' Sean McGivern2016-11-211-0/+43
|\
| * Updated code based on feedbackfix/cycle-analytics-no-dataJames Lopez2016-11-211-2/+2
| * Adds a flag to reflect whether or not there is data in cycle analyticsJames Lopez2016-11-211-0/+43
* | Merge branch 'fix-xss-vulnerability' into 'master' Fatih Acet2016-11-211-1/+1
|\ \
| * | Remove v-htmlFilipa Lacerda2016-11-211-1/+1
* | | Merge branch 'grapify-project-snippet-api' into 'master' Rémy Coutable2016-11-211-14/+50
|\ \ \
| * | | Grapify the projects snippet APIgrapify-project-snippet-apiRobert Schilling2016-11-211-14/+50
* | | | Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern2016-11-217-284/+454
|\ \ \ \
| * | | | Refactor cache refreshing/expiringYorick Peterse2016-11-216-334/+352
| * | | | Use File.exist? to check if a repository existsYorick Peterse2016-11-211-2/+1
| * | | | Unify detecting of special repository filesYorick Peterse2016-11-212-0/+153
| | |/ / | |/| |
* | | | Merge branch 'issue_24303' into 'master' Sean McGivern2016-11-211-17/+48
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow JIRA references for project snippetsissue_24303Felipe Artur2016-11-211-17/+48
* | | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-211-0/+127
|\ \ \ \
| * | | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-217-7/+7
| * | | | fix spec failureJames Lopez2016-11-211-1/+1
| * | | | Added permissions per stage to cycle analytics endpointJames Lopez2016-11-219-8/+135
* | | | | Merge branch '24552-js-environment-timeago-is-not-rendered-and-text-shows-obj...Fatih Acet2016-11-211-1/+53
|\ \ \ \ \
| * | | | | Fix timeago rendering for environment timeago24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widgetClement Ho2016-11-191-1/+53
| |/ / / /
* | | | | Merge branch '24616-mr-shows-the-build-for-this-merge-request-failed-although...Kamil Trzciński2016-11-214-10/+55
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-214-10/+55
* | | | | Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipelineKamil Trzciński2016-11-211-5/+28
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-211-5/+28
* | | | | Merge branch 'grapify-users-api' into 'master' Rémy Coutable2016-11-211-27/+49
|\ \ \ \ \
| * | | | | Grapify the users APIgrapify-users-apiRobert Schilling2016-11-211-27/+49
* | | | | | Merge branch 'dz-fix-group-name-dot' into 'master' Rémy Coutable2016-11-211-5/+13
|\ \ \ \ \ \
| * | | | | | Fix 404 on some group pages when name contains dotdz-fix-group-name-dotDmitriy Zaporozhets2016-11-211-5/+13
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'create-pipeline-endpoint' into 'master' Rémy Coutable2016-11-211-0/+46
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add api endpoint for creating a pipelineIdo Leibovich2016-11-181-0/+46
* | | | | | Merge branch 'issue_5541' into 'master' Sean McGivern2016-11-215-7/+49
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Allow enabling and disabling commit and MR events for JIRAissue_5541Felipe Artur2016-11-185-7/+49
* | | | | | Merge branch 'use-build-in-broadcast-message-spec' into 'master' Rémy Coutable2016-11-211-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use build instead create in BroadcastMessage model specSemyon Pupkov2016-11-191-1/+1
* | | | | | Merge branch '24627-fix-bad-mr-error-message' into 'master' Rémy Coutable2016-11-211-0/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix regression in Merge request formAlex Sanford2016-11-191-0/+7
* | | | | | Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master' Jacob Schatz2016-11-191-2/+2
|\ \ \ \ \ \
| * | | | | | Fix spec24673-broken-test-in-merge_request_widget_spec-jsClement Ho2016-11-181-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch '22539-display-folders' into 'master' Fatih Acet2016-11-1919-230/+990
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix test22539-display-foldersFilipa Lacerda2016-11-191-22/+11
| * | | | | Fix broken testFilipa Lacerda2016-11-191-0/+20
| * | | | | Changes for stop url to pathFilipa Lacerda2016-11-191-16/+0
| * | | | | Try to fix testsKamil Trzcinski2016-11-181-4/+5
| * | | | | Bring back the `commit_url` as it's used by CycleAnalyticsKamil Trzcinski2016-11-181-0/+4
| * | | | | Fix broken testsFilipa Lacerda2016-11-182-11/+11
| * | | | | Merge branch '22539-display-folders' of gitlab.com:gitlab-org/gitlab-ce into ...Kamil Trzcinski2016-11-188-261/+175
| |\ \ \ \ \
| | * | | | | Swaps url for paths in mock dataFilipa Lacerda2016-11-171-11/+10
| | * | | | | Fix Rubocop offense for lines in environment specsGrzegorz Bizon2016-11-171-1/+0
| | * | | | | Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-1718-130/+386
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-1789-331/+1348
| | |\ \ \ \ \ \
| | * | | | | | | Fix test case for environments related to deploymentsGrzegorz Bizon2016-11-171-7/+14
View Lorry Controller Status