summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* restore sourcemaps for default webpack build34012-restore-js-sourcemaps-to-rspec-tests-in-ciMike Greiling2017-06-201-0/+2
* Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-204-31/+67
|\
| * Remove PersonalSnippet case for reportable_note specshide-edit-comment-and-report-as-abuse-conditionallyLuke "Jared" Bennett2017-06-202-40/+8
| * Fixed reportable_note_shared_example for the reportable_note/snippets_specLuke "Jared" Bennett2017-06-162-15/+37
| * Pass more_actions_dropdown vie spec locals to render call instead of stubbing...Luke "Jared" Bennett2017-06-161-44/+15
| * Add view spec for more_actions_dropdown render branchesLuke "Jared" Bennett2017-06-162-18/+87
| * [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-206-8/+26
|\ \
| * | Fix some incorrect usage of translation helpersfix-i18n-helpersRuben Davila2017-06-196-8/+26
* | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-2010-59/+234
|\ \ \
| * | | Refactor GroupProjectsFinder#init_collectionYorick Peterse2017-06-195-38/+106
| * | | Refactor Project.with_feature_available_for_userYorick Peterse2017-06-163-7/+38
| * | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-164-31/+107
* | | | Merge branch 'docs/subgroups-mysql' into 'master'Marcia Ramos2017-06-203-58/+53
|\ \ \ \
| * | | | Add link to issue for MySQL/subgroups drop supportAchilleas Pipinellis2017-06-202-2/+5
| * | | | Mention limitations of MySQL in docsAchilleas Pipinellis2017-06-193-58/+50
* | | | | Merge branch 'remove-changelog' into 'master'Clement Ho2017-06-201-4/+0
|\ \ \ \ \
| * | | | | Remove changelog entryAnnabel Dunstone Gray2017-06-201-4/+0
* | | | | | Merge branch '33363-user-customize-callout-has-no-top-margin-on-projects-page...Annabel Dunstone Gray2017-06-203-4/+2
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Merge branch '31349-async-buttons' into 'master'Phil Hughes2017-06-2016-443/+271
|\ \ \ \ \ \ \
| * | | | | | | Uniformize code between both pipelines tablesFilipa Lacerda2017-06-2016-443/+271
|/ / / / / / /
* | | | | | | Merge branch '33260-allow-admins-to-list-admins' into 'master'Rémy Coutable2017-06-206-4/+53
|\ \ \ \ \ \ \
| * | | | | | | Re-instate is_admin flag in users API is current user is an adminMike Ricketts2017-06-206-4/+53
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqkushalpandya2017-06-201-0/+9
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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
| | |_|/ / / / | |/| | | | |
* | | | | | | Revert "Merge branch 'confidential-issues-redesign-docs' into 'master'"Victor Wu2017-06-202-2/+3
* | | | | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-204-2/+52
|\ \ \ \ \ \ \
| * | | | | | | use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missingPawel Chojnacki2017-06-201-2/+5
| * | | | | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-194-2/+49
* | | | | | | | Merge branch 'api-doc-os-license-alphabetical-order' into 'master'Rémy Coutable2017-06-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Moved Open source license templates link into alphabetical orderMike Fisher2017-06-191-1/+1
* | | | | | | | | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-204-16/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticksDouwe Maan2017-06-194-16/+16
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'issue-task-status-fix' into 'master'Filipa Lacerda2017-06-206-34/+41
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Stop showing task status if no tasks are presentPhil Hughes2017-06-206-34/+41
|/ / / / / / / /
* | | | | | | | Merge branch 'winh-cleanup-vue-warnings' into 'master'Phil Hughes2017-06-206-2/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up Vue warnings in testsWinnie Hellmann2017-06-206-2/+33
|/ / / / / / / /
* | | | | | | | Merge branch '33734-transient-karma-failure-on-master-for-date-time-utils-tim...Phil Hughes2017-06-201-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "Transient karma failure on master for `Date time utils timeFor retur...Mike Greiling2017-06-201-0/+4
|/ / / / / / / /
* | | | | | | | 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-202-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcitEric Eastwood2017-06-192-2/+4
* | | | | | | | | Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'Phil Hughes2017-06-202-1/+17
|\ \ \ \ \ \ \ \ \