summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.3.0v9.3.0Clement Ho2017-06-221-1/+1
|
* Update CHANGELOG.md for 9.3.0Clement Ho2017-06-22216-874/+214
| | | [ci skip]
* Update VERSION to 9.3.0-rc7v9.3.0-rc7Clement Ho2017-06-221-1/+1
|
* Merge branch '9-3-stable-rc7' into '9-3-stable'Clement Ho2017-06-2261-2505/+492
|\ | | | | | | | | Prepare 9.3 RC7 See merge request !12348
| * Merge branch 'dm-restore-capybara-screenshot' into 'master'Robert Speicher2017-06-211-2/+3
| | | | | | | | | | Don't reset the session when the example failed to fix capybara-screenshot See merge request !12370
| * Merge branch '33833-issue-and-mr-state-tabs-don-t-work-on-dashboard' into ↵9-3-stable-rc7Jacob Schatz2017-06-215-34/+21
| | | | | | | | | | | | | | | | | | 'master' Resolve "Issue and MR state tabs don't work on dashboard" Closes #33833 See merge request !12278
| * Merge branch ↵Annabel Dunstone Gray2017-06-215-40/+75
| | | | | | | | | | | | | | | | | | '33917-mr-comment-system-note-highlight-don-t-have-the-same-width' into 'master' Resolve "MR comment + system note highlight don't have the same width" Closes #33917 See merge request !12364
| * Merge branch 'fix-33259' into 'master'Sean McGivern2017-06-214-35/+67
| | | | | | | | | | | | | | Fix GitHub importer performance on branch existence check Closes #33259 See merge request !12324
| * Merge branch 'system-note-commits-list-gradient-fix' into 'master'Annabel Dunstone Gray2017-06-212-1/+5
| | | | | | | | | | | | | | Fixed commit list system not gradient Closes #33896 See merge request !12306
| * Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master'Kamil Trzciński2017-06-215-55/+95
| | | | | | | | | | | | | | Don't expand CI_ENVIRONMENT_URL so runner would do Closes #34008 See merge request !12344
| * Merge branch 'fix/gb/improve-build-stage-reference-migration' into 'master'Kamil Trzciński2017-06-217-25/+77
| | | | | | | | | | | | | | Improve build stages reference migration Closes #33866 See merge request !12337
| * Merge branch 'fix/gb/improve-autocancel-pipelines-migraton' into 'master'Kamil Trzciński2017-06-211-0/+2
| | | | | | | | | | Disable statement timeout in CI pipelines migration See merge request !12268
| * Merge branch 'disable-environment-list-polling' into 'master'Grzegorz Bizon2017-06-213-4/+8
| | | | | | | | | | Disable environment list polling as it breaks deployboard See merge request !12347
| * Merge branch 'add-index-for-head-pipeline-id' into 'master'Yorick Peterse2017-06-212-1/+18
| | | | | | | | | | | | Add index for head pipeline See merge request !12273
| * Merge branch ↵Phil Hughes2017-06-212-4/+25
| | | | | | | | | | | | | | | | | | '33693-protected-branch-dropdowns-cut-off-in-repository-settings-page' into 'master' Resolve "Protected branch dropdowns cut-off in Repository Settings page" Closes #33693 See merge request !12247
| * Merge branch '33878-fix-edit-deploy-key' into 'master'Rémy Coutable2017-06-215-3/+34
| | | | | | | | | | | | | | Fix edit button for deploy keys available from other projects Closes #33878 See merge request !12301
| * Fixes scrolling + improves Performance through assigning found $ elements to ↵Tim Zallmann2017-06-212-7/+16
| | | | | | | | variables
| * Merge branch '33824-update-mr-prometheus-docs' into 'master'Achilleas Pipinellis2017-06-212-4/+4
| | | | | | | | | | Update Prometheus Merge Request Metrics page See merge request !12259
| * Merge branch 'bulk-edit-scroll-fix' into 'master'Phil Hughes2017-06-214-5/+29
| | | | | | | | | | | | | | Bulk edit scroll fix Closes #33870 See merge request !12219
| * Merge branch 'bvl-revert-regenerating-translations' into 'master'Douwe Maan2017-06-2113-2286/+14
| | | | | | | | | | | | Revert "Regenerate po and js files" See merge request !12044
* | Update VERSION to 9.3.0-rc6v9.3.0-rc6Clement Ho2017-06-211-1/+1
|/
* Merge branch '33879-buttons-margin' into '9-3-stable'Phil Hughes2017-06-211-0/+4
|\ | | | | | | | | Adds margin between buttons in CI header See merge request !12302
| * Adds margin between buttons in Pipeline's header33879-buttons-marginFilipa Lacerda2017-06-201-0/+4
| |
* | Merge branch '9-3-stable-rc6' into '9-3-stable'Kushal Pandya2017-06-2164-561/+860
|\ \ | | | | | | | | | | | | Prepare 9.3 for RC6 See merge request !12312
| * \ Merge branch 'revert-6ac777a7' into '9-3-stable-rc6'9-3-stable-rc6Clement Ho2017-06-2110-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 Ho2017-06-2010-262/+111
| | | | | | | | | | | | This reverts merge request !11759
| * | | Merge branch 'delete-fix-missing-function-changelog' into 'master'Stan Hu2017-06-201-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 Schatz2017-06-203-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 specDouwe Maan2017-06-201-1/+1
| | |
| * | Fix docs lintClement Ho2017-06-201-2/+2
| | |
| * | Merge branch 'disable-Style/PreferredHashMethods-cop' into 'master'Robert Speicher2017-06-201-1/+1
| | | | | | | | | | | | | | | Disable the Style/PreferredHashMethods cop See merge request !12065
| * | Merge branch 'fix-email-avatars' into 'master'Douwe Maan2017-06-204-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 Pipinellis2017-06-203-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 Maan2017-06-204-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 Maan2017-06-205-7/+25
| | | | | | | | | | | | | | | | | | Fix some incorrect usage of translation helpers See merge request !12274
| * | Merge branch 'docs/subgroups-mysql' into 'master'Marcia Ramos2017-06-203-58/+53
| | | | | | | | | | | | | | | Mention limitations of MySQL in docs See merge request !12272
| * | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-2010-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 McGivern2017-06-204-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 Ho2017-06-201-4/+0
| | | | | | | | | | | | | | | Remove changelog entry See merge request !12309
| * | 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 admin Closes #33260 See merge request !12211
| * | 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 code See merge request !12276
| * | Merge branch 'search-clear-button-center' into 'master'Annabel Dunstone Gray2017-06-201-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 Ho2017-06-204-37/+43
|/ / | | | | | | | | | | | | Revert sticky confidential header Closes #33840 See merge request !12307
* | Update VERSION to 9.3.0-rc5v9.3.0-rc5kushalpandya2017-06-201-1/+1
| |
* | Merge branch '9-3-stable-rc5' into '9-3-stable'Kushal Pandya2017-06-2049-255/+708
|\ \ | | | | | | | | | | | | Prepare 9.3 RC5 See merge request !12283
| * | Merge branch 'issue-task-status-fix' into 'master'9-3-stable-rc5Filipa Lacerda2017-06-206-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 Hughes2017-06-202-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 Hughes2017-06-201-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 Hughes2017-06-202-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 Hu2017-06-202-0/+8
| | | | | | | | | | | | | | | | | | | | | Restored missing function inside dropzone_input.js Closes #33836 See merge request !12279