Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'add-sentry-js-again-with-vue' into 'master' | Phil Hughes | 2017-05-05 | 9 | -6/+141 |
|\ | | | | | | | | | Add sentry JS See merge request !6764 | ||||
| * | Review changesadd-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-05 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-05-04 | 67 | -457/+1477 |
| |\ | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| * \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-04 | 82 | -456/+1287 |
| |\ \ | |||||
| * | | | [ci skip] Moved the required restart message to only backend sentry field | Luke "Jared" Bennett | 2017-05-03 | 1 | -2/+1 |
| | | | | |||||
| * | | | [ci skip] Removed substring | Luke "Jared" Bennett | 2017-05-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] remove accidental debug print | Luke "Jared" Bennett | 2017-05-03 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-03 | 128 | -736/+1678 |
| |\ \ \ | |||||
| * | | | | Removed debug message | 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 | 9 | -10/+49 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-28 | 119 | -609/+1346 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed specs | Luke "Jared" Bennett | 2017-04-28 | 2 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Fixed view to correct property | Luke "Jared" Bennett | 2017-04-28 | 3 | -9/+3 |
| | | | | | | | |||||
| * | | | | | | Attempted adding separate clientside_sentry settings | Luke "Jared" Bennett | 2017-04-28 | 5 | -9/+26 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-26 | 269 | -3238/+4526 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * | | | | | | | Added sampling function and blacklisted common urls and error messages | Luke "Jared" Bennett | 2017-04-18 | 1 | -0/+53 |
| | | | | | | | | |||||
| * | | | | | | | Removed rewire and fixed tests | Luke "Jared" Bennett | 2017-04-15 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-15 | 598 | -7055/+11032 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | 4 | -10/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gon to head | ||||
| * | | | | | | | | Updated units | Luke "Jared" Bennett | 2017-04-14 | 2 | -9/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | [ci skip] Index and singleton improvements with some more unit, more to come | Luke "Jared" Bennett | 2017-04-13 | 2 | -13/+18 |
| | | | | | | | | | |||||
| * | | | | | | | | [ci skip] Remove loadscript class in favour of backend conditional | Luke "Jared" Bennett | 2017-04-13 | 9 | -358/+64 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-04 | 3267 | -26829/+39512 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Added raven and raven-vue plugin, updated gon_helper with data needed for ↵ | Luke Bennett | 2017-01-23 | 4 | -0/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch '30007-done-todo-hover-state' into 'master' | Filipa Lacerda | 2017-05-05 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30007 Add transparent top-border to the hover state of done todos Closes #30007 See merge request !11104 | ||||
| * | | | | | | | | | | 30007 Add transparent top-border to the hover state of done todos30007-done-todo-hover-state | tauriedavis | 2017-05-04 | 1 | -1/+2 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'cycle-anyltics-landing-box-fix' into 'master' | Annabel Dunstone Gray | 2017-05-05 | 2 | -11/+30 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed cycle analytics intro box styling regression Closes #31844 See merge request !11111 | ||||
| * | | | | | | | | | | Fixed cycle analytics intro box styling regressioncycle-anyltics-landing-box-fix | Phil Hughes | 2017-05-05 | 2 | -11/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31844 | ||||
* | | | | | | | | | | | Merge branch '31689-request-access-spacing' into 'master' | Annabel Dunstone Gray | 2017-05-05 | 3 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31689 Add default margin-top to user request table on project members page Closes #31689 See merge request !11103 | ||||
| * | | | | | | | | | | | 31689 Add default margin-top to user request table on project members page31689-request-access-spacing | tauriedavis | 2017-05-04 | 3 | -5/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge 'dev/master' into master | Ruben Davila | 2017-05-05 | 4 | -10/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'droplab-templating-xss-fix' into 'master' | Jacob Schatz | 2017-05-03 | 4 | -10/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | droplab templating xss fix See merge request !2085 | ||||
| | * | | | | | | | | | | | | [ci skip] Add comment to regex | Luke "Jared" Bennett | 2017-04-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-26 | 26 | -96/+124 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Fixed being behind | Luke "Jared" Bennett | 2017-04-26 | 3 | -13/+24 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-25 | 26 | -99/+642 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Fixed dodgy merge | Luke "Jared" Bennett | 2017-04-24 | 3 | -24/+13 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-24 | 229 | -3024/+3715 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-17 | 5 | -45/+62 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-15 | 10 | -34/+116 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-14 | 85 | -2160/+2235 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Used underscore to template list children to utilize their simple escaped ↵ | Luke "Jared" Bennett | 2017-04-12 | 4 | -10/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interpolation | ||||
* | | | | | | | | | | | | | | | | | | | Merge branch '12910-personal-snippets-notes' into 'master' | Sean McGivern | 2017-05-05 | 28 | -88/+142 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support comments for personal snippets Closes #12910 See merge request !11090 | ||||
| * | | | | | | | | | | | | | | | | | | | Support comments for personal snippets | Jarka Kadlecova | 2017-05-05 | 28 | -88/+142 |
| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Wrap note actions below timestamp on discussions | Sam Rose | 2017-05-05 | 1 | -6/+10 |
|/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'issue-boards-no-avatar' into 'master' | Filipa Lacerda | 2017-05-05 | 6 | -12/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -14/+12 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into issue-boards-no-avatar | Phil Hughes | 2017-05-04 | 241 | -1498/+3421 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Fixed avatar not displaying in issue boards | Phil Hughes | 2017-04-28 | 3 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens when Gravatar is disabled in the admin settings, the avatar is returned as null & then frontend didn't do anything about it. Closes #31428 | ||||
* | | | | | | | | | | | | | | | | | | | | | Add instant comments support | Kushal Pandya | 2017-05-05 | 7 | -60/+349 |
| | | | | | | | | | | | | | | | | | | | | |