Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'add-sentry-js-again-with-vue' into 'master' | Phil Hughes | 2017-05-05 | 3 | -0/+341 |
|\ | | | | | | | | | Add sentry JS See merge request !6764 | ||||
| * | Review changesadd-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-05 | 2 | -5/+2 |
| | | |||||
| * | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-05-04 | 31 | -248/+1300 |
| |\ | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| * \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-04 | 48 | -290/+1945 |
| |\ \ | |||||
| * | | | Remove focused kamra test | Luke "Jared" Bennett | 2017-05-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] Removed substring | Luke "Jared" Bennett | 2017-05-03 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-03 | 166 | -1041/+3512 |
| |\ \ \ | |||||
| * | | | | Removed puts | Luke "Jared" Bennett | 2017-04-28 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-28 | 7 | -7/+284 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-28 | 67 | -416/+2558 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed specs | Luke "Jared" Bennett | 2017-04-28 | 2 | -15/+17 |
| | | | | | | | |||||
| * | | | | | | Fixed view to correct property | Luke "Jared" Bennett | 2017-04-28 | 1 | -22/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-26 | 328 | -2385/+4963 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * | | | | | | | Added sampling function and blacklisted common urls and error messages | Luke "Jared" Bennett | 2017-04-18 | 1 | -0/+62 |
| | | | | | | | | |||||
| * | | | | | | | Removed rewire and fixed tests | Luke "Jared" Bennett | 2017-04-15 | 2 | -17/+28 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-15 | 354 | -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" Bennett | 2017-04-15 | 2 | -8/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gon to head | ||||
| * | | | | | | | | Updated units | Luke "Jared" Bennett | 2017-04-14 | 2 | -75/+85 |
| | | | | | | | | | |||||
| * | | | | | | | | [ci skip] Index and singleton improvements with some more unit, more to come | Luke "Jared" Bennett | 2017-04-13 | 4 | -71/+48 |
| | | | | | | | | | |||||
| * | | | | | | | | [ci skip] Remove loadscript class in favour of backend conditional | Luke "Jared" Bennett | 2017-04-13 | 7 | -286/+152 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-04 | 1176 | -11396/+53243 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Added raven and raven-vue plugin, updated gon_helper with data needed for ↵ | Luke Bennett | 2017-01-23 | 7 | -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 master | Ruben Davila | 2017-05-05 | 2 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'droplab-templating-xss-fix' into 'master' | Jacob Schatz | 2017-05-03 | 2 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | droplab templating xss fix See merge request !2085 | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-26 | 9 | -21/+118 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Fixed being behind | Luke "Jared" Bennett | 2017-04-26 | 2 | -0/+70 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-25 | 206 | -561/+911 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fixed dodgy merge | Luke "Jared" Bennett | 2017-04-24 | 2 | -70/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-24 | 132 | -1805/+3704 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-17 | 4 | -9/+64 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-15 | 2 | -3/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-14 | 39 | -542/+1311 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Update specs | Luke "Jared" Bennett | 2017-04-12 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch '12910-personal-snippets-notes' into 'master' | Sean McGivern | 2017-05-05 | 5 | -4/+213 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support comments for personal snippets Closes #12910 See merge request !11090 | ||||
| * | | | | | | | | | | | | | | | | | Support comments for personal snippets | Jarka Kadlecova | 2017-05-05 | 5 | -4/+213 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'backport-ee-4b464eaaee' into 'master' | Robert Speicher | 2017-05-05 | 5 | -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-4b464eaaee | Rémy Coutable | 2017-05-04 | 5 | -8/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'prometheus-integration-test-setting-fix' into 'master' | Robert Speicher | 2017-05-05 | 3 | -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-fix | Jose Ivan Vargas | 2017-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Improved code styling and added a HTTParty rescue block | Jose Ivan Vargas | 2017-05-04 | 3 | -22/+27 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Added specs | Jose Ivan Vargas | 2017-05-04 | 2 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Added rescue block for the test method for the prometheus service | Jose Ivan Vargas | 2017-05-04 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mrchrisw-import-shell-timeout' | Sean McGivern | 2017-05-05 | 1 | -0/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout | Chris Wilson | 2017-04-27 | 1 | -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 McGivern | 2017-05-05 | 2 | -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 Chojnacki | 2017-05-05 | 2 | -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 Lacerda | 2017-05-05 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed avatar not displaying in issue boards Closes #31428 See merge request !10977 | ||||
| * | | | | | | | | | | | | | | | | | | | | | Changed how the default avatar is setissue-boards-no-avatar | Phil Hughes | 2017-05-04 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Add instant comments support | Kushal Pandya | 2017-05-05 | 6 | -5/+243 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '30237-pipelines-actions-make-2-requests' into 'master' | Kamil Trzciński | 2017-05-05 | 1 | -0/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve: "Pipelines: When we retry a pipeline 2 requests are made to the pipelines endpoint" Closes #30237 See merge request !10584 |