summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes2017-05-059-6/+141
|\ | | | | | | | | Add sentry JS See merge request !6764
| * Review changesadd-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-051-1/+1
| |
| * Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-05-0467-457/+1477
| |\ | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0482-456/+1287
| |\ \
| * | | [ci skip] Moved the required restart message to only backend sentry fieldLuke "Jared" Bennett2017-05-031-2/+1
| | | |
| * | | [ci skip] Removed substringLuke "Jared" Bennett2017-05-031-1/+1
| | | |
| * | | [ci skip] remove accidental debug printLuke "Jared" Bennett2017-05-031-2/+0
| | | |
| * | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-03128-736/+1678
| |\ \ \
| * | | | Removed debug messageLuke "Jared" Bennett2017-04-281-1/+0
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-289-10/+49
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-28119-609/+1346
| |\ \ \ \ \
| * | | | | | Fixed specsLuke "Jared" Bennett2017-04-282-2/+5
| | | | | | |
| * | | | | | Fixed view to correct propertyLuke "Jared" Bennett2017-04-283-9/+3
| | | | | | |
| * | | | | | Attempted adding separate clientside_sentry settingsLuke "Jared" Bennett2017-04-285-9/+26
| | | | | | |
| * | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-26269-3238/+4526
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * | | | | | | Added sampling function and blacklisted common urls and error messagesLuke "Jared" Bennett2017-04-181-0/+53
| | | | | | | |
| * | | | | | | Removed rewire and fixed testsLuke "Jared" Bennett2017-04-151-3/+3
| | | | | | | |
| * | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-15598-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" Bennett2017-04-154-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gon to head
| * | | | | | | | Updated unitsLuke "Jared" Bennett2017-04-142-9/+11
| | | | | | | | |
| * | | | | | | | [ci skip] Index and singleton improvements with some more unit, more to comeLuke "Jared" Bennett2017-04-132-13/+18
| | | | | | | | |
| * | | | | | | | [ci skip] Remove loadscript class in favour of backend conditionalLuke "Jared" Bennett2017-04-139-358/+64
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-043267-26829/+39512
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Added raven and raven-vue plugin, updated gon_helper with data needed for ↵Luke Bennett2017-01-234-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 Lacerda2017-05-051-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-statetauriedavis2017-05-041-1/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cycle-anyltics-landing-box-fix' into 'master' Annabel Dunstone Gray2017-05-052-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-fixPhil Hughes2017-05-052-11/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31844
* | | | | | | | | | | Merge branch '31689-request-access-spacing' into 'master' Annabel Dunstone Gray2017-05-053-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-spacingtauriedavis2017-05-043-5/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge 'dev/master' into masterRuben Davila2017-05-054-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'droplab-templating-xss-fix' into 'master' Jacob Schatz2017-05-034-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | droplab templating xss fix See merge request !2085
| | * | | | | | | | | | | | [ci skip] Add comment to regexLuke "Jared" Bennett2017-04-271-1/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-2626-96/+124
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed being behindLuke "Jared" Bennett2017-04-263-13/+24
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-2526-99/+642
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fixed dodgy mergeLuke "Jared" Bennett2017-04-243-24/+13
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-24229-3024/+3715
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-175-45/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-1510-34/+116
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-1485-2160/+2235
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Used underscore to template list children to utilize their simple escaped ↵Luke "Jared" Bennett2017-04-124-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interpolation
* | | | | | | | | | | | | | | | | | | Merge branch '12910-personal-snippets-notes' into 'master' Sean McGivern2017-05-0528-88/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support comments for personal snippets Closes #12910 See merge request !11090
| * | | | | | | | | | | | | | | | | | | Support comments for personal snippetsJarka Kadlecova2017-05-0528-88/+142
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Wrap note actions below timestamp on discussionsSam Rose2017-05-051-6/+10
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'issue-boards-no-avatar' into 'master' Filipa Lacerda2017-05-056-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-046-14/+12
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into issue-boards-no-avatarPhil Hughes2017-05-04241-1498/+3421
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fixed avatar not displaying in issue boardsPhil Hughes2017-04-283-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 supportKushal Pandya2017-05-057-60/+349
| | | | | | | | | | | | | | | | | | | | |