summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes2017-05-053-0/+341
|\ | | | | | | | | Add sentry JS See merge request !6764
| * Review changesadd-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-052-5/+2
| |
| * Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-05-0431-248/+1300
| |\ | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0448-290/+1945
| |\ \
| * | | Remove focused kamra testLuke "Jared" Bennett2017-05-031-1/+1
| | | |
| * | | [ci skip] Removed substringLuke "Jared" Bennett2017-05-031-3/+3
| | | |
| * | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-03166-1041/+3512
| |\ \ \
| * | | | Removed putsLuke "Jared" Bennett2017-04-281-1/+0
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-287-7/+284
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-2867-416/+2558
| |\ \ \ \ \
| * | | | | | Fixed specsLuke "Jared" Bennett2017-04-282-15/+17
| | | | | | |
| * | | | | | Fixed view to correct propertyLuke "Jared" Bennett2017-04-281-22/+0
| | | | | | |
| * | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-26328-2385/+4963
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * | | | | | | Added sampling function and blacklisted common urls and error messagesLuke "Jared" Bennett2017-04-181-0/+62
| | | | | | | |
| * | | | | | | Removed rewire and fixed testsLuke "Jared" Bennett2017-04-152-17/+28
| | | | | | | |
| * | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-15354-3955/+14202
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml # config/webpack.config.js
| * | | | | | | | Updated specs, added rewire, updated layouts to move conditional raven and ↵Luke "Jared" Bennett2017-04-152-8/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gon to head
| * | | | | | | | Updated unitsLuke "Jared" Bennett2017-04-142-75/+85
| | | | | | | | |
| * | | | | | | | [ci skip] Index and singleton improvements with some more unit, more to comeLuke "Jared" Bennett2017-04-134-71/+48
| | | | | | | | |
| * | | | | | | | [ci skip] Remove loadscript class in favour of backend conditionalLuke "Jared" Bennett2017-04-137-286/+152
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-041176-11396/+53243
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Added raven and raven-vue plugin, updated gon_helper with data needed for ↵Luke Bennett2017-01-237-0/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raven and created raven_config, required by application.js Added is_production to define sentry environment Removed as much jQuery as possible Added public_sentry_dsn application_settings helper method Use URI module instead of regex for public dsn Removed raven-vue and load raven on if sentry is enabled Add load_script spec added raven_config spec added class_spec_helper and tests added sentry_helper spec added feature spec
* | | | | | | | | | Merge 'dev/master' into masterRuben Davila2017-05-052-2/+8
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'droplab-templating-xss-fix' into 'master' Jacob Schatz2017-05-032-2/+8
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | droplab templating xss fix See merge request !2085
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-269-21/+118
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed being behindLuke "Jared" Bennett2017-04-262-0/+70
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-25206-561/+911
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fixed dodgy mergeLuke "Jared" Bennett2017-04-242-70/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-24132-1805/+3704
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-174-9/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-152-3/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-1439-542/+1311
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update specsLuke "Jared" Bennett2017-04-122-2/+8
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '12910-personal-snippets-notes' into 'master' Sean McGivern2017-05-055-4/+213
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support comments for personal snippets Closes #12910 See merge request !11090
| * | | | | | | | | | | | | | | | | Support comments for personal snippetsJarka Kadlecova2017-05-055-4/+213
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'backport-ee-4b464eaaee' into 'master' Robert Speicher2017-05-055-8/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaee See merge request !11072
| * | | | | | | | | | | | | | | | | | Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaeebackport-ee-4b464eaaeeRémy Coutable2017-05-045-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | Merge branch 'prometheus-integration-test-setting-fix' into 'master' Robert Speicher2017-05-053-1/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rescue block for the test method for the prometheus service Closes #31451 See merge request !10994
| * | | | | | | | | | | | | | | | | | | Improved changelog entry, also changed error message for HTTParty errorprometheus-integration-test-setting-fixJose Ivan Vargas2017-05-041-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Improved code styling and added a HTTParty rescue blockJose Ivan Vargas2017-05-043-22/+27
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Added specsJose Ivan Vargas2017-05-042-0/+28
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Added rescue block for the test method for the prometheus serviceJose Ivan Vargas2017-05-041-2/+3
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mrchrisw-import-shell-timeout'Sean McGivern2017-05-051-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeoutChris Wilson2017-04-271-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab uses the import_project method in GitLab Shell, This method uses a timeout for the operation, hardcoded to 800 seconds. With this MR the timeout is now configurable in the gitlab_shell settings.
* | | | | | | | | | | | | | | | | | | | | Merge branch '31747-fix-transient-failures-when-tests-run-too-fast' into ↵Sean McGivern2017-05-052-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Expect latency to be non-negative number. Closes #31747 See merge request !11116
| * | | | | | | | | | | | | | | | | | | | Set minimum latency to be non-negative number.Pawel Chojnacki2017-05-052-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the tests run so fast latency is calculated as 0. This causes transient failures in our CI.
* | | | | | | | | | | | | | | | | | | | | Merge branch 'issue-boards-no-avatar' into 'master' Filipa Lacerda2017-05-051-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed avatar not displaying in issue boards Closes #31428 See merge request !10977
| * | | | | | | | | | | | | | | | | | | | | Changed how the default avatar is setissue-boards-no-avatarPhil Hughes2017-05-041-0/+21
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Add instant comments supportKushal Pandya2017-05-056-5/+243
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch '30237-pipelines-actions-make-2-requests' into 'master' Kamil Trzciński2017-05-051-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve: "Pipelines: When we retry a pipeline 2 requests are made to the pipelines endpoint" Closes #30237 See merge request !10584