summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Review changesLuke "Jared" Bennett2017-02-281-2/+4
* Fix testsZ.J. van de Weg2017-02-241-1/+1
* Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-2435-145/+329
|\
| * Merge branch '28610-white-square-nav' into 'master' Filipa Lacerda2017-02-231-6/+10
| |\
| | * Fix white square and sidebar animation28610-white-square-navAnnabel Dunstone Gray2017-02-231-6/+10
| * | Merge branch 'master' into 'master' Clement Ho2017-02-232-0/+38
| |\ \
| | * | on branch deletion show loading icon and disabled the buttonwendy04022017-02-222-0/+38
| * | | Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-23158-976/+764
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '28495-content-shifting' into 'master' Filipa Lacerda2017-02-231-10/+6
| | |\ \
| | | * | Keep right padding the same whether sidebar is open or not28495-content-shiftingAnnabel Dunstone Gray2017-02-211-10/+6
| | * | | Merge branch 'remove-require-context-filtered-search-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+9
| | |\ \ \
| | | * | | remove require.context from filtered_search_bundleremove-require-context-filtered-search-bundleMike Greiling2017-02-221-3/+9
| | * | | | Merge branch 'remove-require-context-graphs-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+4
| | |\ \ \ \
| | | * | | | remove require.context from graphs_bundleremove-require-context-graphs-bundleMike Greiling2017-02-221-3/+4
| | | |/ / /
| | * | | | remove require.context from network_bundleremove-require-context-network-bundleMike Greiling2017-02-221-3/+2
| | |/ / /
| | * | | Merge branch '22466-task-list-alignment' into 'master' Annabel Dunstone Gray2017-02-223-11/+31
| | |\ \ \
| | | * | | Position task list checkbox to match the list indentJared Deckard2017-02-103-11/+31
| | * | | | Merge branch 'add-issues-tooltip' into 'master' Alfredo Sumaran2017-02-221-3/+39
| | |\ \ \ \
| | | * | | | Added tooltip to add issues button on issue boardsPhil Hughes2017-02-211-3/+39
| | * | | | | Merge branch 'newline-after-file-attachment-notes' into 'master' Alfredo Sumaran2017-02-221-2/+3
| | |\ \ \ \ \
| | | * | | | | Added double newline after file upload markdown insertLuke "Jared" Bennett2017-02-221-2/+3
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'gamesover/gitlab-ce-broken_iamge_when_doing_offline_update_chec...Clement Ho2017-02-221-8/+8
| | |\ \ \ \ \
| | | * | | | | added specs for version check imagegamesover/gitlab-ce-broken_iamge_when_doing_offline_update_check(help_page)Luke "Jared" Bennett2017-02-221-8/+8
| | * | | | | | Merge branch 'remove-require-context-boards-bundle' into 'master' Alfredo Sumaran2017-02-221-8/+12
| | |\ \ \ \ \ \
| | | * | | | | | remove unneeded eslint exceptionsremove-require-context-boards-bundleMike Greiling2017-02-201-1/+1
| | | * | | | | | remove require.context from boards_bundleMike Greiling2017-02-201-7/+11
| | * | | | | | | Merge branch 'revert-2cf17c42' into 'master' Alfredo Sumaran2017-02-223-20/+46
| | |\ \ \ \ \ \ \
| | | * | | | | | | Revert "Merge branch '27934-left-align-nav' into 'master'"revert-2cf17c42Annabel Dunstone Gray2017-02-213-20/+46
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'remove-require-context-diff-notes-bundle' into 'master' Alfredo Sumaran2017-02-221-7/+11
| | |\ \ \ \ \ \ \
| | | * | | | | | | remove require.context from diff_notes_bundleremove-require-context-diff-notes-bundleMike Greiling2017-02-201-7/+11
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'remove-require-context-cycle-analytics-bundle' into 'master' Alfredo Sumaran2017-02-221-4/+14
| | |\ \ \ \ \ \ \
| | | * | | | | | | remove require.context from cycle_analytics_bundleremove-require-context-cycle-analytics-bundleMike Greiling2017-02-201-4/+14
| | | |/ / / / / /
| | * | | | | | | Merge branch 'feature/brand-logo-in-emails' into 'master' Sean McGivern2017-02-222-0/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | extract pipeline mails layoutAlexis Reigel2017-02-222-0/+0
| | * | | | | | | | Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-222-0/+6
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-21137-874/+506
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | * | | | | | | | Add merge request count to each issue on issues listblackst0ne2017-02-172-0/+6
| | * | | | | | | | | Merge branch '24651-environments-list-buttons' into 'master' Annabel Dunstone Gray2017-02-223-39/+42
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | | * | | | | | | | Use a btn-group to group all action buttons24651-environments-list-buttonsFilipa Lacerda2017-02-213-39/+42
| | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Merge branch '27287-label-dropdown-error-messages' into 'master'Sean McGivern2017-02-221-3/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | fix new label errors not visible in dropdown for #27287, also humanize error ...Tom Koole2017-02-091-3/+3
| | * | | | | | | | | Merge branch 'add-filtered-search-to-mr' into 'master' Alfredo Sumaran2017-02-226-39/+44
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-216-39/+44
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch '26703-todos-count' into 'master' Clement Ho2017-02-213-1/+6
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | change todos counter position & format ( for large counts )mhasbini2017-02-213-1/+6
| | * | | | | | | | | Merge branch '28186-long-group-names-overflow-out-of-todos-view' into 'master' Filipa Lacerda2017-02-211-7/+37
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Truncate long title text on Todo items28186-long-group-names-overflow-out-of-todos-viewSam Rose2017-02-201-7/+37
| | * | | | | | | | | | Merge branch 'dropdown-loading-class-add' into 'master' Filipa Lacerda2017-02-211-1/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fixed eslint errordropdown-loading-class-addPhil Hughes2017-02-201-1/+1
| | | * | | | | | | | | Changes when loading indicator is added to dropdownPhil Hughes2017-02-201-1/+2
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | |