summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-196-5/+37
* Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'Filipa Lacerda2017-05-192-1/+17
* Merge branch '28558-update-copy' into 'master' Filipa Lacerda2017-05-191-2/+2
* Remove incorrectly picked styles9-2-stable-fix-conflicts-for-mr-11189kushalpandya2017-05-201-4/+0
* Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-192-1/+14
|\
| * Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master' Sean McGivern2017-05-191-0/+9
| * Merge branch '9-2-stable-fix-conflicts-for-mr-11547' into '9-2-stable'Regis Boudinot2017-05-191-1/+5
| |\
| | * Resolve header.scss conflictsLuke "Jared" Bennett2017-05-191-3/+0
| | * Merge branch 'fix-header-z-index' into 'master'9-2-stable-fix-conflicts-for-mr-11547Annabel Dunstone Gray2017-05-191-1/+8
* | | Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-1986-812/+849
|\ \ \ | |/ /
| * | 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-193-7/+23
| |\ \ \
| | * | | 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 '32556-side-by-side-mr-discussion-should-stretch-to-max-width' i...Annabel Dunstone Gray2017-05-191-1/+0
| * | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' in...Filipa Lacerda2017-05-192-13/+11
| | |_|_|/ | |/| | |
| * | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'Douwe Maan2017-05-197-102/+116
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix 9.2 conflicts for 'Fix conflict resolution from corrupted upstream'9-2-stable-fix-conflicts-for-mr-11298Douwe Maan2017-05-192-32/+1
| | * | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'Douwe Maan2017-05-197-73/+118
| * | | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-192-8/+23
| | |/ / | |/| |
| * | | 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
| * | | | Merge branch 'fix/allow-accessing-appearance-images' into 'master'Rémy Coutable2017-05-191-0/+2
| * | | | 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 'issue-boards-sidebar-create-new-label-404-error' into 'master' Filipa Lacerda2017-05-191-1/+1
| * | | | 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-193-11/+18
| * | | | Merge branch 'cycle-analytics-stage-title-translation-fix' into 'master' Filipa Lacerda2017-05-191-1/+1
| * | | | Merge branch '32103-last-scheduled-pipeline-link-only-showing-ci-status-icon'...Kamil Trzciński2017-05-191-0/+1
| * | | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-193-0/+20
| * | | | Merge branch '31886-remover-comment-load-spinner' into 'master' Annabel Dunstone Gray2017-05-191-3/+0
| * | | | Merge branch 'update_assignee_cache_counts_refactoring' into 'master' Sean McGivern2017-05-195-16/+13
| * | | | Merge branch '32096-fix-new-branch-dropdown-position-size' into 'master' Phil Hughes2017-05-191-5/+7
| * | | | Merge branch 'winh-autocomplete-error' into 'master'Phil Hughes2017-05-194-53/+62
| * | | | Merge branch 'mk-fix-routable-redirect-message' into 'master' Douwe Maan2017-05-191-4/+4
| * | | | Merge branch 'environments-button-open-same-tab' into 'master' Annabel Dunstone Gray2017-05-191-1/+0
| * | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11332' into '9-2-stable'Phil Hughes2017-05-195-80/+107
| |\ \ \ \
| | * | | | Fix 9.2 conflicts for "Polish UI on pipeline schedules form"Timothy Andrew2017-05-195-80/+107
| * | | | | Merge branch 'get_rid_of_pluck' into 'master' Yorick Peterse2017-05-191-3/+7
| |/ / / /
| * | | | Merge branch '32359-align-resolve-btn' into 'master'Filipa Lacerda2017-05-191-3/+3
| * | | | Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master'Phil Hughes2017-05-192-8/+21