Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'add-sentry-js-again-with-vue' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+23 |
|\ | | | | | | | | | Add sentry JS See merge request !6764 | ||||
| * | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-05-04 | 3 | -4/+115 |
| |\ | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| * \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-04 | 12 | -95/+303 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-03 | 23 | -34/+677 |
| |\ \ \ | |||||
| * | | | | 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 | 3 | -5/+81 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-28 | 14 | -16/+521 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed specs | Luke "Jared" Bennett | 2017-04-28 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-26 | 100 | -738/+862 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-15 | 82 | -418/+1428 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml # config/webpack.config.js | ||||
| * | | | | | | | | [ci skip] Remove loadscript class in favour of backend conditional | Luke "Jared" Bennett | 2017-04-13 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-04 | 182 | -1874/+7897 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Added raven and raven-vue plugin, updated gon_helper with data needed for ↵ | Luke Bennett | 2017-01-23 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | | | | | Support comments for personal snippets | Jarka Kadlecova | 2017-05-05 | 1 | -2/+62 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Add instant comments support | Kushal Pandya | 2017-05-05 | 2 | -0/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-04 | 16 | -98/+458 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb | ||||
| * | | | | | | | | | Resolve "Web GUI: Unable to create new branch from commit SHA" | Luke "Jared" Bennett | 2017-05-04 | 1 | -0/+48 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'deploy-keys-load-async' into 'master' | Filipa Lacerda | 2017-05-04 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy keys load async Closes #29667 See merge request !10973 | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-04 | 8 | -87/+277 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-03 | 28 | -45/+782 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fixed some spinach & rspec tests | Phil Hughes | 2017-04-28 | 1 | -4/+8 |
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' | Sean McGivern | 2017-05-04 | 1 | -0/+59 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blob viewer for job artifacts Closes #31297 See merge request !11018 | ||||
| | * | | | | | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewer | Douwe Maan | 2017-05-04 | 1 | -0/+59 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Allow to create new branch and empty WIP merge request from issue page | Alfredo Sumaran | 2017-05-04 | 2 | -62/+91 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' | Sean McGivern | 2017-05-03 | 1 | -6/+72 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow commenting on older versions of the diff and comparisons between diff versions See merge request !10388 | ||||
| | * | | | | | | | | | Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diff | Douwe Maan | 2017-05-03 | 1 | -6/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | versions | ||||
| * | | | | | | | | | | Merge branch 'dm-blob-external-storage' into 'master' | Sean McGivern | 2017-05-03 | 1 | -3/+40 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobs See merge request !11048 | ||||
| | * | | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storage | Douwe Maan | 2017-05-03 | 1 | -3/+40 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'further-attempt-to-fix-protected_tags_spec' into 'master' | Sean McGivern | 2017-05-03 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try waiting for previous dropdown to definitly close before going to click See merge request !11070 | ||||
| | * | | | | | | | | | | remove debug codefurther-attempt-to-fix-protected_tags_spec | Luke "Jared" Bennett | 2017-05-03 | 1 | -2/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Try waiting for previous dropdown to definitly close before going to click | Luke "Jared" Bennett | 2017-05-03 | 2 | -3/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add real-time note edits :chipmunk: | Eric Eastwood | 2017-05-03 | 2 | -14/+71 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'fix-issue_sidebar_spec-failure-and-remove-sleep' into 'master' | Sean McGivern | 2017-05-03 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue_sidebar_spec.rb click as true click cannot hit the right element and removed sleep See merge request !11064 | ||||
| | * | | | | | | | | | | Revert to real click seeing as that was a bug with only the original branchfix-issue_sidebar_spec-failure-and-remove-sleep | Luke "Jared" Bennett | 2017-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed issue_sidebar_spec.rb click as true click cannot hit the right element ↵ | Luke "Jared" Bennett | 2017-05-03 | 1 | -4/+2 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and removed sleep | ||||
| * | | | | | | | | | | Fix lazy error handling of cron parser | Dosuken shinya | 2017-05-03 | 1 | -0/+18 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch '30667-creating-new-label-on-new-issue-causing-bug' into 'master' | Rémy Coutable | 2017-05-03 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix label creation from issuable for subgroup projects Closes #30667 See merge request !11011 | ||||
| | * | | | | | | | | | | Fix label creation from issuable for subgroup projects | Mark Fletcher | 2017-05-03 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'async-milestone-tabs' into 'master' | Jacob Schatz | 2017-05-03 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load milestone tabs asynchronously See merge request !10919 | ||||
| | * | | | | | | | | | | Fixed feature spec not waiting for ajax request to finish | Phil Hughes | 2017-04-26 | 1 | -0/+3 |
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed 404 in project milestones when not logged in | ||||
| * | | | | | | | | | | Merge branch 'fix-create_new_mr_spec-dropdown-transient-failure' into 'master' | Sean McGivern | 2017-05-03 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find and match first dropdown before clicking See merge request !11060 | ||||
| | * | | | | | | | | | find and match first dropdown before clicking | Luke "Jared" Bennett | 2017-05-03 | 1 | -3/+1 |
| | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'fix-protected_tags_spec-master-dropdown-transient-failure' ↵ | Sean McGivern | 2017-05-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Added find before clicking the access_type_name within the dropdown See merge request !11051 | ||||
| | * | | | | | | | | | Find an actual list itemfix-protected_tags_spec-master-dropdown-transient-failure | Luke "Jared" Bennett | 2017-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added find before clicking the access_type_name within the dropdown | Luke "Jared" Bennett | 2017-05-03 | 1 | -0/+1 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'fix-issue_sidebar_spec-master-transient-failure' into 'master' | Sean McGivern | 2017-05-03 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added find for collapsed sidebar before asserting See merge request !11052 | ||||
| | * | | | | | | | | | Added find for collapsed sidebar before assertingfix-issue_sidebar_spec-master-transient-failure | Luke "Jared" Bennett | 2017-05-03 | 1 | -0/+2 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch ↵ | Phil Hughes | 2017-05-03 | 1 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31057-unnecessary-padding-along-left-side-of-assignees-dropdown' into 'master' Resolve "Unnecessary padding along left side of assignees dropdown" Closes #31057 See merge request !10767 | ||||
| | * | | | | | | | | Display check next to assigned user in dropdown | Sam Rose | 2017-04-28 | 1 | -0/+38 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
* | | | | | | | | | Add CHANGELOG entry, some specs and locale file for German. | Ruben Davila | 2017-05-04 | 1 | -0/+19 |
|/ / / / / / / / |