summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '9-2-stable' into fix-9-2-stable-conflicts-for-mr-11744Clement Ho2017-06-1212-51/+75
|\
| * Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into '...Clement Ho2017-06-121-1/+1
| * Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-06-121-1/+1
| * Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11793' i...Timothy Andrew2017-06-081-1/+1
| |\
| | * Fix conflict in app/assets/javascripts/blob/viewer/index.jsfix-9-2-stable-conflicts-for-mr-11793Sean McGivern2017-06-081-40/+1
| | * Merge branch '33048-markdown-rendering-of-md-files-has-ceased-to-display-late...Douwe Maan2017-06-081-0/+39
| * | Merge branch 'issue-boards-label-filtering' into 'master' Filipa Lacerda2017-06-081-1/+4
| * | Merge branch 'issue-title-fade-fix' into '9-2-stable'Filipa Lacerda2017-06-081-1/+1
| * | Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Fatih Acet2017-06-082-3/+7
| * | Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gon...Fatih Acet2017-06-086-43/+60
| |/
* | Fix conflictsClement Ho2017-06-081-256/+32
* | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' i...Phil Hughes2017-06-082-2/+262
|/
* Merge branch '33265-fix-9-2-stable-issue-description-flash-newlines' into '9-...Phil Hughes2017-06-083-5/+9
|\
| * Fix description flash with newline differences (HTML entities)33265-fix-9-2-stable-issue-description-flash-newlinesEric Eastwood2017-06-063-5/+9
* | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'Timothy Andrew2017-05-311-2/+2
* | Revert "Merge branch 'issue-title-fade-fix' into '9-2-stable'"Timothy Andrew2017-05-301-1/+1
|/
* Replace nextTick with setTimeoutPhil Hughes2017-05-261-1/+1
* Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-252-1/+6
* Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-242-0/+6
* Merge branch 'acet-fix-mr-widget-state' into 'master'Douwe Maan2017-05-241-4/+4
* Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-232-2/+1
* Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' i...Fatih Acet2017-05-231-3/+2
* Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into 'm...Phil Hughes2017-05-221-2/+3
* Merge branch '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-221-1/+1
* Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'Filipa Lacerda2017-05-191-1/+1
* Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-191-0/+9
|\
| * Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master' Sean McGivern2017-05-191-0/+9
* | Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-1940-492/+453
|\ \ | |/
| * Merge branch 'tab-title-blank' into '9-2-stable'Regis Boudinot2017-05-191-2/+2
| |\
| | * Correctly set title_text with API datatab-title-blankPhil Hughes2017-05-191-2/+2
| * | Merge branch '9-2-stable-fix-conflicts-for-mr-11391' into '9-2-stable'Clement Ho2017-05-192-5/+22
| |\ \
| | * | Fix conflicts9-2-stable-fix-conflicts-for-mr-11391Clement Ho2017-05-191-147/+16
| * | | Merge branch '9-2-stable-fix-conflicts-for-mr-11463' into '9-2-stable'Regis Boudinot2017-05-191-26/+25
| |\ \ \
| | * | | Resolve mr_widget_header conflict9-2-stable-fix-conflicts-for-mr-11463Jose Ivan Vargas2017-05-191-29/+0
| | * | | Merge branch 'fix-trailing-space-mr-widget' into 'master'Fatih Acet2017-05-191-0/+28
| | | |/ | | |/|
| * | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' in...Filipa Lacerda2017-05-191-11/+11
| |/ /
| * | Merge branch '9-2-stable-fix-conflicts-for-mr-11427' into '9-2-stable'Douwe Maan2017-05-191-0/+1
| |\ \
| | * | Fixed merging conflict on the blob load viewer9-2-stable-fix-conflicts-for-mr-11427Tim Zallmann2017-05-191-39/+1
| | * | Merge branch 'dm-scroll-to-blob-user-content' into 'master'Douwe Maan2017-05-181-0/+39
| * | | Merge branch 'mr-widget-refresh-failed' into 'master'Filipa Lacerda2017-05-191-1/+27
| * | | Fix deployment status icon and alignment on 9-2-stable branchkushalpandya2017-05-191-1/+1
| * | | Fix incorrect import for `UsersSelect` on 9-2-stable branchkushalpandya2017-05-191-1/+0
| * | | Remove line referencing an non-existing class in the 9-2-stable branchRémy Coutable2017-05-191-1/+0
| * | | Merge branch 'fix-main-bundle-sans-vue' into 'master' Clement Ho2017-05-192-7/+14
| * | | Merge branch 'fix-search-not-highlighting' into 'master'Filipa Lacerda2017-05-191-1/+6
| * | | Merge branch 'winh-german-cycle-analytics' into 'master' Douwe Maan2017-05-191-1/+1
| * | | Merge branch 'pipeline-schedules-callout-docs-url' into 'master' Filipa Lacerda2017-05-192-10/+17
| * | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-191-0/+1
| * | | Merge branch '31886-remover-comment-load-spinner' into 'master' Annabel Dunstone Gray2017-05-191-3/+0
| * | | Merge branch 'winh-autocomplete-error' into 'master'Phil Hughes2017-05-193-44/+52