summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-192-3/+3
| | |/ / | |/| |
* | | | Merge branch '25164-disable-fork-on-project-limit' into 'master'Rémy Coutable2017-06-191-0/+4
|\ \ \ \
| * | | | Disable fork button on project limitvanadium232017-06-161-0/+4
* | | | | Merge branch 'reduce-sidekiq-wait-timings' into 'master'Rémy Coutable2017-06-191-1/+1
|\ \ \ \ \
| * | | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-191-1/+1
* | | | | | Merge branch '30725-reset-user-limits-when-unchecking-external-user' into 'ma...Douwe Maan2017-06-191-13/+16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | refactors user model validations30725-reset-user-limits-when-unchecking-external-userTiago Botelho2017-06-191-9/+9
| * | | | | Ensures default user limits when external user is uncheckedTiago Botelho2017-06-161-6/+9
* | | | | | Use color inputs for broadcast messagesAnnabel Dunstone Gray2017-06-191-2/+2
* | | | | | Merge branch 'winh-label-filter-hover' into 'master'Annabel Dunstone Gray2017-06-192-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Darken label color in search filter when hoveringwinh-label-filter-hoverwinh2017-06-162-1/+2
* | | | | | Merge branch '33819-authorby' into 'master'Douwe Maan2017-06-191-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | correct ByAuthor translation in commit box33819-authorbySimon Knox2017-06-191-1/+1
* | | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-192-39/+9
|\ \ \ \ \ \
| * | | | | | Add “Project moved” error to Git-over-HTTPMichael Kozono2017-06-162-39/+9
| | |_|_|/ / | |/| | | |
* | | | | | [#27697] Make the arrow icons consistent in dropdownTM Lee2017-06-197-26/+53
* | | | | | Merge branch 'add-since-and-until-params-to-issuables' into 'master'Rémy Coutable2017-06-191-0/+13
|\ \ \ \ \ \
| * | | | | | add since and until params to issuablesKyle Bishop2017-06-181-0/+13
* | | | | | | Merge branch '33461-display-user-id' into 'master'Grzegorz Bizon2017-06-191-4/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | #33461: Display own user id in account settings pageRiccardo Padovani2017-06-131-4/+11
| |/ / / / /
* | | | | | Merge branch 'consistent-filtered-search-boards' into 'master'Phil Hughes2017-06-191-1/+0
|\ \ \ \ \ \
| * | | | | | Make filtered search boards more consistent with EEconsistent-filtered-search-boardsClement Ho2017-06-161-1/+0
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'consistent-dropdown-hint' into 'master'Phil Hughes2017-06-191-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Make dropdown hint consistent with EE versionconsistent-dropdown-hintClement Ho2017-06-161-1/+1
| |/ / / /
* | | | | Merge branch 'mr-widget-memory-usage-tech-debt-fix' into 'master'Phil Hughes2017-06-171-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Changed utilites imports from ~ to relative pathsJose Ivan Vargas2017-06-161-2/+2
* | | | | Fixed overflow on mobile screens for the slash commandsJose Ivan Vargas Lopez2017-06-161-0/+11