summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34017-common-vue' into 'master'Tim Zallmann2017-06-212-3/+6
|\
| * Remove vue from main.bundle.js file being loaded through `app/assets/javascri...34017-common-vueFilipa Lacerda2017-06-212-3/+6
* | Resolve "Protected branch dropdowns cut-off in Repository Settings page"Luke "Jared" Bennett2017-06-212-4/+25
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceTim Zallmann2017-06-2144-558/+584
|\ \
| * | Bulk edit scroll fixBryce Johnson2017-06-213-5/+10
| |/
| * Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'34013-names-with-spaces-break-issue-filter-barJacob Schatz2017-06-201-1/+1
| |\
| | * Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editingEric Eastwood2017-06-201-1/+1
| * | Merge branch '30213-project-transfer-move-rollback' into 'master'Douwe Maan2017-06-201-40/+74
| |\ \
| | * | Rollback project folder move after error in Projects::TransferService30213-project-transfer-move-rollbackJames Edwards-Jones2017-06-201-40/+74
| * | | Merge branch 'fix-email-avatars' into 'master'Douwe Maan2017-06-203-8/+8
| |\ \ \
| | * | | Fix avatar images in pipeline emailsfix-email-avatarsSean McGivern2017-06-203-8/+8
| * | | | Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-201-14/+19
| |\ \ \ \
| | * | | | Add view spec for more_actions_dropdown render branchesLuke "Jared" Bennett2017-06-161-18/+17
| | * | | | [ci skip] Correct rendering more actions dropdown when there are no actions a...Luke "Jared" Bennett2017-06-161-2/+6
| | * | | | Correct 'report as abuse' nesting in _more_actions_dropdown.html.hamlLuke "Jared" Bennett2017-06-161-4/+4
| | * | | | Update _more_actions_dropdown.html.haml to only show 'Edit comment' when user...Luke "Jared" Bennett2017-06-161-5/+7
| * | | | | Merge branch 'fix-i18n-helpers' into 'master'Douwe Maan2017-06-204-5/+5
| |\ \ \ \ \
| | * | | | | Fix some incorrect usage of translation helpersfix-i18n-helpersRuben Davila2017-06-194-5/+5
| * | | | | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-205-47/+140
| |\ \ \ \ \ \
| | * | | | | | Refactor GroupProjectsFinder#init_collectionYorick Peterse2017-06-194-38/+74
| | * | | | | | Refactor Project.with_feature_available_for_userYorick Peterse2017-06-162-7/+26
| | * | | | | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-161-19/+57
| * | | | | | | Resolve "User customize callout has no top-margin on projects page"Luke "Jared" Bennett2017-06-203-4/+2
| * | | | | | | Merge branch 'search-clear-button-center' into 'master'Annabel Dunstone Gray2017-06-201-3/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed filtered search clear button being off-centersearch-clear-button-centerPhil Hughes2017-06-201-3/+0
| * | | | | | | | Uniformize code between both pipelines tablesFilipa Lacerda2017-06-2010-357/+246
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch '33840-revert-sticky-confidential-header' into 'master'confidential-issues-revertClement Ho2017-06-204-37/+43
| |\ \ \ \ \ \ \
| | * | | | | | | Revert sticky confidential headerAnnabel Dunstone Gray2017-06-204-37/+43
| * | | | | | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-201-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-0/+4
| * | | | | | | | | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-202-3/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticksDouwe Maan2017-06-192-3/+3
| * | | | | | | | | | Stop showing task status if no tasks are presentPhil Hughes2017-06-205-34/+29
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Fixes scrolling + improves Performance through assigning found $ elements to ...Tim Zallmann2017-06-202-7/+16
|/ / / / / / / / /
* | | | | | | | | Merge branch '33865-add-emoji-parallel-view' into 'master'Phil Hughes2017-06-201-5/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix hover style for emoji button on parallel diff view33865-add-emoji-parallel-viewAnnabel Dunstone Gray2017-06-191-5/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'Phil Hughes2017-06-201-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcitEric Eastwood2017-06-191-1/+3
* | | | | | | | | | Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'Phil Hughes2017-06-201-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix issue description syntax highlighting and math rendering33877-fix-issue-description-highlight-and-mathEric Eastwood2017-06-191-1/+1
* | | | | | | | | | Merge branch 'fix-missing-function-dropzone-input' into 'master'Stan Hu2017-06-191-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Restored missing function inside dropzone_input.jsJose Ivan Vargas2017-06-191-0/+4
* | | | | | | | | | | Merge branch 'enable-autocomplete-on-project-snippets' into 'master'Jacob Schatz2017-06-192-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Enable autocomplete on project snippetsenable-autocomplete-on-project-snippetsEric Eastwood2017-06-192-1/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-196-26/+66
|/ / / / / / / / /
* | | | | | | | | Merge branch '33598-fix-autocomplete-disabled-in-gl-form-instances' into 'mas...Jacob Schatz2017-06-191-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Re-enable autocomplete for milestones, tags, releases, and wikiEric Eastwood2017-06-191-7/+7
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'Clement Ho2017-06-195-5/+23
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Disable autocomplete on snippets commentsEric Eastwood2017-06-195-5/+23
| |/ / / / / / /
* | | | | | | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-192-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |