| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update VERSION to 9.3.0-rc6v9.3.0-rc6 | Clement Ho | 2017-06-21 | 1 | -1/+1 |
| | | |||||
| * | Merge branch '33879-buttons-margin' into '9-3-stable' | Phil Hughes | 2017-06-21 | 1 | -0/+4 |
| |\ | | | | | | | | | Adds margin between buttons in CI header See merge request !12302 | ||||
| | * | Adds margin between buttons in Pipeline's header33879-buttons-margin | Filipa Lacerda | 2017-06-20 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch '9-3-stable-rc6' into '9-3-stable' | Kushal Pandya | 2017-06-21 | 64 | -561/+860 |
| |\ \ | | | | | | | | | | | | | Prepare 9.3 for RC6 See merge request !12312 | ||||
| | * \ | Merge branch 'revert-6ac777a7' into '9-3-stable-rc6'9-3-stable-rc6 | Clement Ho | 2017-06-21 | 10 | -262/+111 |
| | |\ \ | | | | | | | | | | | | | | | | | Revert "Merge branch 'winh-merge-request-related-issues' into 9-3-stable-rc6 See merge request !12321 | ||||
| | | * | | Revert "Merge branch 'winh-merge-request-related-issues' into 'master'" | Clement Ho | 2017-06-20 | 10 | -262/+111 |
| | | | | | | | | | | | | | This reverts merge request !11759 | ||||
| | * | | | Merge branch 'delete-fix-missing-function-changelog' into 'master' | Stan Hu | 2017-06-20 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | Deleted "fix-missing-function-dropzone-input.yml" from the changelog See merge request !12316 | ||||
| | * | | | Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master' | Jacob Schatz | 2017-06-20 | 3 | -33/+78 |
| | |/ / | | | | | | | | | | | | | | | | | | | Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note Closes #33868 See merge request !12297 | ||||
| | * | | Restore class that went missing in conflict resolution to fix spec | Douwe Maan | 2017-06-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix docs lint | Clement Ho | 2017-06-20 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'disable-Style/PreferredHashMethods-cop' into 'master' | Robert Speicher | 2017-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Disable the Style/PreferredHashMethods cop See merge request !12065 | ||||
| | * | | Merge branch 'fix-email-avatars' into 'master' | Douwe Maan | 2017-06-20 | 4 | -39/+68 |
| | | | | | | | | | | | | | | | | | | | | | | Fix avatar images in pipeline emails Closes gitlab-ee#2696 See merge request !12310 | ||||
| | * | | Merge branch '33922-add-ruby-metrics-documentation' into 'master' | Achilleas Pipinellis | 2017-06-20 | 3 | -2/+57 |
| | | | | | | | | | | | | | | | | Add documentation for GitLab ruby monitoring See merge request !12295 | ||||
| | * | | Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master' | Douwe Maan | 2017-06-20 | 4 | -31/+67 |
| | | | | | | | | | | | | | | | | Only show 'Edit comment'/'Report as abuse' when user has perms/isnt current_user See merge request !12096 | ||||
| | * | | Merge branch 'fix-i18n-helpers' into 'master' | Douwe Maan | 2017-06-20 | 5 | -7/+25 |
| | | | | | | | | | | | | | | | | | | | Fix some incorrect usage of translation helpers See merge request !12274 | ||||
| | * | | Merge branch 'docs/subgroups-mysql' into 'master' | Marcia Ramos | 2017-06-20 | 3 | -58/+53 |
| | | | | | | | | | | | | | | | | Mention limitations of MySQL in docs See merge request !12272 | ||||
| | * | | Merge branch 'refactor-projects-finder-init-collection' into 'master' | Rémy Coutable | 2017-06-20 | 10 | -59/+234 |
| | | | | | | | | | | | | | | | | | | | | | | Refactor ProjectsFinder#init_collection and GroupProjectsFinder#init_collection Closes #33632 See merge request !12135 | ||||
| | * | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' ↵ | Sean McGivern | 2017-06-20 | 4 | -1/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Do not enable prometheus metrics when metrics folder is missing See merge request !12263 | ||||
| | * | | Merge branch 'remove-changelog' into 'master' | Clement Ho | 2017-06-20 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | Remove changelog entry See merge request !12309 | ||||
| | * | | Merge branch '33260-allow-admins-to-list-admins' into 'master' | Rémy Coutable | 2017-06-20 | 6 | -4/+53 |
| | | | | | | | | | | | | | | | | | | | | | | Re-instate is_admin flag in users API is current user is an admin Closes #33260 See merge request !12211 | ||||
| | * | | Merge branch 'dm-chat-message-backticks' into 'master' | Sean McGivern | 2017-06-20 | 4 | -16/+16 |
| | | | | | | | | | | | | | | | | Remove backticks from chat messages because they're not rendered as code See merge request !12276 | ||||
| | * | | Merge branch 'search-clear-button-center' into 'master' | Annabel Dunstone Gray | 2017-06-20 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | Fixed filtered search clear button being off-center Closes #33912 See merge request !12304 | ||||
| | * | | Merge branch '33840-revert-sticky-confidential-header' into 'master' | Clement Ho | 2017-06-20 | 4 | -37/+43 |
| |/ / | | | | | | | | | | | | | Revert sticky confidential header Closes #33840 See merge request !12307 | ||||
| * | | Update VERSION to 9.3.0-rc5v9.3.0-rc5 | kushalpandya | 2017-06-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '9-3-stable-rc5' into '9-3-stable' | Kushal Pandya | 2017-06-20 | 49 | -255/+708 |
| |\ \ | | | | | | | | | | | | | Prepare 9.3 RC5 See merge request !12283 | ||||
| | * | | Merge branch 'issue-task-status-fix' into 'master'9-3-stable-rc5 | Filipa Lacerda | 2017-06-20 | 6 | -34/+41 |
| | | | | | | | | | | | | | | | | | | | | | | Stop showing task status if no tasks are present Closes #33880 See merge request !12303 | ||||
| | * | | Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master' | Phil Hughes | 2017-06-20 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | Fix note highlight being added when you don't have a URL fragment hash #note_xxx Closes #33916 See merge request !12293 | ||||
| | * | | Merge branch '33865-add-emoji-parallel-view' into 'master' | Phil Hughes | 2017-06-20 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | Fix hover style for emoji button on parallel diff view Closes #33865 See merge request !12281 | ||||
| | * | | Merge branch '33877-fix-issue-description-highlight-and-math' into 'master' | Phil Hughes | 2017-06-20 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | Fix issue description syntax highlighting and math rendering Closes #33877 See merge request !12282 | ||||
| | * | | Merge branch 'fix-missing-function-dropzone-input' into 'master' | Stan Hu | 2017-06-20 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | Restored missing function inside dropzone_input.js Closes #33836 See merge request !12279 | ||||
| | * | | Remove double escaping of comment preview text | kushalpandya | 2017-06-20 | 1 | -2/+1 |
| | | | | |||||
| | * | | Merge branch '9-3-stable-rc5-autocomplete' into '9-3-stable-rc5' | Kushal Pandya | 2017-06-20 | 6 | -5/+39 |
| | |\ \ | | | | | | | | | | | | | | | | | Resolve '33594-disable-autocomplete-on-snippet-comments' conflicts See merge request !12284 | ||||
| | | * | | Resolve "slash command" vs "quick action" conflicts9-3-stable-rc5-autocomplete | Eric Eastwood | 2017-06-19 | 2 | -24/+5 |
| | | | | | | | | | | | | | | | | | | | | | This was renamed in 9.4, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11811 | ||||
| | | * | | Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master' | Clement Ho | 2017-06-19 | 6 | -3/+56 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | Disable autocomplete on snippets comments Closes #33594 See merge request !12108 | ||||
| | * | | Merge branch 'enable-autocomplete-on-project-snippets' into 'master' | Jacob Schatz | 2017-06-19 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Enable autocomplete on project snippets Closes #33911 See merge request !12286 | ||||
| | * | | Merge branch 'winh-merge-request-related-issues' into 'master' | Fatih Acet | 2017-06-19 | 10 | -111/+262 |
| | | | | | | | | | | | | | | | | | | | | | | Adjust position and wording for related issues in merge requests Closes #33652 See merge request !11759 | ||||
| | * | | Merge branch '33598-fix-autocomplete-disabled-in-gl-form-instances' into ↵ | Jacob Schatz | 2017-06-19 | 8 | -48/+147 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Re-enable autocomplete for milestones, tags, releases, and wiki Closes #33598 See merge request !12110 | ||||
| | * | | Merge branch 'docs/object-storage' into 'master' | Achilleas Pipinellis | 2017-06-19 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | Add info about artifacts object storage in docs See merge request !12208 | ||||
| | * | | Merge branch 'sh-refactor-current-settings' into 'master' | Robert Speicher | 2017-06-19 | 5 | -20/+120 |
| | | | | | | | | | | | | | | | | If migrations are pending, make CurrentSettings use existing values and populate missing columns with defaults See merge request !12253 | ||||
| | * | | Merge branch 'group-label-permissions-docs' into 'master' | Achilleas Pipinellis | 2017-06-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Docs permissions for group labels See merge request !12269 | ||||
| | * | | Merge branch 'reduce-sidekiq-wait-timings' into 'master' | Rémy Coutable | 2017-06-19 | 3 | -2/+6 |
| | | | | | | | | | | | | | | | | Reduce wait timings for Sidekiq jobs See merge request !12270 | ||||
| | * | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master' | Sean McGivern | 2017-06-19 | 5 | -24/+33 |
| |/ / | | | | | | | | | | | | | Don't display comment on unchanged line on both sides in parallel diff Closes #33864 See merge request !12275 | ||||
| * | | Update VERSION to 9.3.0-rc4v9.3.0-rc4 | Clement Ho | 2017-06-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '9-3-stable-rc4' into '9-3-stable' | Clement Ho | 2017-06-19 | 177 | -1215/+2305 |
| |\ \ | |/ |/| | | | | | Prepare 9.3 RC4 See merge request !12260 | ||||
| | * | Merge branch 'issue-board-docs' into 'master' | Achilleas Pipinellis | 2017-06-19 | 1 | -2/+3 |
| | | | | | | | | | | | Issue board docs See merge request !12197 | ||||
| | * | Merge branch 'jira-integ-docs' into 'master' | Achilleas Pipinellis | 2017-06-19 | 2 | -3/+3 |
| | | | | | | | | | | | Jira integ docs See merge request !12196 | ||||
| | * | Merge branch 'confidential-issues-redesign-docs' into 'master' | Achilleas Pipinellis | 2017-06-19 | 2 | -3/+2 |
| | | | | | | | | | | | Confidential issues redesign docs See merge request !12195 | ||||
| | * | Merge branch 'convdev-docs' into 'master' | Achilleas Pipinellis | 2017-06-19 | 3 | -1/+31 |
| | | | | | | | | | | | Convdev docs See merge request !12189 | ||||
| | * | Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master' | Jacob Schatz | 2017-06-19 | 1 | -2/+3 |
| | | | | | | | | | | | Update ruby metrics endpoint text to be clearer See merge request !12157 | ||||
| | * | Merge branch 'sh-support-cdns' into 'master' | Robert Speicher | 2017-06-19 | 2 | -1/+5 |
| | | | | | | | | | | | Support a configurable Rails asset_host to allow for CDNs See merge request !12102 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |