| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'revert-6ac777a7' into '9-3-stable-rc6'9-3-stable-rc6 | Clement Ho | 2017-06-21 | 4 | -196/+85 |
| |\ | | | | | | | | | 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 | 4 | -196/+85 |
| | | | | | | | This reverts merge request !11759 | ||||
| * | | Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master' | Jacob Schatz | 2017-06-20 | 2 | -32/+77 |
| |/ | | | | | | | Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note Closes #33868 See merge request !12297 | ||||
| * | Merge branch 'fix-email-avatars' into 'master' | Douwe Maan | 2017-06-20 | 1 | -31/+60 |
| | | | | | | | | Fix avatar images in pipeline emails Closes gitlab-ee#2696 See merge request !12310 | ||||
| * | Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master' | Douwe Maan | 2017-06-20 | 3 | -17/+48 |
| | | | | | | Only show 'Edit comment'/'Report as abuse' when user has perms/isnt current_user See merge request !12096 | ||||
| * | Merge branch 'refactor-projects-finder-init-collection' into 'master' | Rémy Coutable | 2017-06-20 | 3 | -0/+75 |
| | | | | | | | | 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 | 1 | -0/+30 |
| | | | | | | | | | into 'master' Do not enable prometheus metrics when metrics folder is missing See merge request !12263 | ||||
| * | Merge branch '33260-allow-admins-to-list-admins' into 'master' | Rémy Coutable | 2017-06-20 | 2 | -1/+40 |
| | | | | | | | | 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 | 2 | -13/+13 |
| | | | | | | Remove backticks from chat messages because they're not rendered as code See merge request !12276 | ||||
| * | Merge branch 'issue-task-status-fix' into 'master'9-3-stable-rc5 | Filipa Lacerda | 2017-06-20 | 1 | -0/+12 |
| | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | Fix note highlight being added when you don't have a URL fragment hash #note_xxx Closes #33916 See merge request !12293 | ||||
| * | Merge branch '33877-fix-issue-description-highlight-and-math' into 'master' | Phil Hughes | 2017-06-20 | 1 | -0/+16 |
| | | | | | | | | Fix issue description syntax highlighting and math rendering Closes #33877 See merge request !12282 | ||||
| * | Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master' | Clement Ho | 2017-06-19 | 2 | -1/+17 |
| | | | | | | | | | 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 | 1 | -0/+14 |
| | | | | | | | | | 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 | 4 | -85/+196 |
| | | | | | | | | 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 | 7 | -41/+140 |
| | | | | | | | | | | 'master' Re-enable autocomplete for milestones, tags, releases, and wiki Closes #33598 See merge request !12110 | ||||
| * | Merge branch 'sh-refactor-current-settings' into 'master' | Robert Speicher | 2017-06-19 | 3 | -0/+67 |
| | | | | | | If migrations are pending, make CurrentSettings use existing values and populate missing columns with defaults See merge request !12253 | ||||
| * | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master' | Sean McGivern | 2017-06-19 | 1 | -1/+10 |
| | | | | | | | | Don't display comment on unchanged line on both sides in parallel diff Closes #33864 See merge request !12275 | ||||
| * | Resolve conflicts in job entity specs | Grzegorz Bizon | 2017-06-19 | 1 | -26/+1 |
| | | |||||
| * | Merge branch 'fix-external-ci-services' into 'master' | Grzegorz Bizon | 2017-06-19 | 10 | -93/+251 |
| | | | | | | | | | Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176 | ||||
| * | Merge branch 'tc-fix-group-finder-subgrouping' into 'master' | Douwe Maan | 2017-06-19 | 3 | -11/+87 |
| | | | | | | | | Show private subgroups if member of parent group Closes #32135 See merge request !11764 | ||||
| * | Merge branch '9-3-stable-rc3-i18n' into '9-3-stable-rc4' | Clement Ho | 2017-06-19 | 28 | -507/+300 |
| |\ | | | | | | | | | Resolve "Missing translations for the project & repository pages" conflicts See merge request !12243 | ||||
| | * | Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18n | Douwe Maan | 2017-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing translations for the project & repository pages. Closes #33420 See merge request !12052 Conflicts: app/assets/javascripts/locale/en/app.js app/assets/javascripts/locale/es/app.js app/views/projects/pipeline_schedules/_form.html.haml locale/en/gitlab.po locale/es/gitlab.po locale/gitlab.pot | ||||
| | * | Revert 'New file from interface on existing branch' | Douwe Maan | 2017-06-15 | 9 | -399/+4 |
| | | | |||||
| | * | Merge branch 'sh-recaptcha-fix-try2' into 'master' | Sean McGivern | 2017-06-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | Make sure reCAPTCHA configuration is loaded when spam checks are initiated Closes #33532 See merge request !12080 | ||||
| | * | Merge branch 'fix-filename-of-artifact-uploader' into 'master' | Grzegorz Bizon | 2017-06-15 | 2 | -2/+39 |
| | | | | | | | | | | | | | | | Fix filename method of GitlabUploader to return always real filename Closes #33524 See merge request !12113 | ||||
| | * | Merge branch 'rc/load-images-in-phantomjs' into 'master' | Robert Speicher | 2017-06-15 | 3 | -12/+9 |
| | | | | | | | | | | | Let PhantomJS load local images See merge request !12003 | ||||
| | * | Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master' | Kamil Trzciński | 2017-06-15 | 3 | -19/+50 |
| | | | | | | | | | | | | | | | Set artifact working directory to be in the destination store to prevent unnecessary I/O Closes #33274 See merge request !11905 | ||||
| | * | Merge branch '29010-perf-bar' into 'master' | Robert Speicher | 2017-06-15 | 2 | -1/+82 |
| | | | | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439 | ||||
| | * | Merge branch 'port-post-receive-changes' into 'master' | Robert Speicher | 2017-06-15 | 1 | -16/+13 |
| | | | | | | | | | | | Refactor PostReceive worker to limit merge conflicts See merge request !11916 | ||||
| | * | Merge branch 'zj-raise-etag-route-regex-miss' into 'master' | Kamil Trzciński | 2017-06-15 | 2 | -52/+25 |
| | | | | | | | | | | | | | | | Raise etag route regex miss Closes #33106 See merge request !12084 | ||||
| | * | Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master' | Phil Hughes | 2017-06-15 | 1 | -0/+45 |
| | | | | | | | | | | | | | | | Fix note highlight being lost after real time update Closes #33483 See merge request !12098 | ||||
| | * | Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' ↵ | Clement Ho | 2017-06-15 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | into 'master' Fix autocomplete not working on note edit form Closes #33529 See merge request !12106 | ||||
| | * | Merge branch 'fix-manual-actions' into 'master' | Grzegorz Bizon | 2017-06-15 | 3 | -3/+19 |
| | | | | | | | | | | | | | | | Do not show manual actions that cannot be run Closes #32380 See merge request !12121 | ||||
| | * | Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master' | Kamil Trzciński | 2017-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Do not expose internal artifacts hash in build entity Closes #33605 See merge request !12124 | ||||
| | * | Merge branch '33642-timeago-update' into 'master' | Phil Hughes | 2017-06-15 | 1 | -12/+1 |
| | | | | | | | | | | | | | | | Remove js classes from vue component that are not needed in vue component Closes #33642 See merge request !12133 | ||||
| | * | Merge branch 'instrument-merge-request-diff-load-commits' into 'master' | Sean McGivern | 2017-06-15 | 1 | -0/+1 |
| | | | | | | | | | | | Instrument MergeRequestDiff#load_commits See merge request !12162 | ||||
| | * | Merge branch 'dm-fix-parser-cache' into 'master' | Sean McGivern | 2017-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | Don't return nil for missing objects from parser cache See merge request !12168 | ||||
| * | | Merge branch '33779-reset-session-before-blocking-requests' into 'master' | Robert Speicher | 2017-06-17 | 2 | -6/+9 |
| | | | | | | | | | | | | | | | Call Capybara.reset_sessions! before block_and_wait_for_requests_complete Closes #33779 See merge request !12224 | ||||
| * | | Merge branch 'sh-fix-issue-33756' into 'master' | Rémy Coutable | 2017-06-17 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | Wait for all Ajax and Vue requests to complete in JavaScript tests Closes #33756 See merge request !12203 | ||||
| * | | Merge branch 'rc/load-images-in-phantomjs' into 'master' | Robert Speicher | 2017-06-16 | 3 | -12/+9 |
| |/ | | | | | Let PhantomJS load local images See merge request !12003 | ||||
| * | Fix bad merge9-3-stable-rc2 | Clement Ho | 2017-06-09 | 1 | -1/+1 |
| | | |||||
| * | remove lines that were incorrectly reinserted after 4f824d2a | Mike Greiling | 2017-06-09 | 1 | -3/+1 |
| | | |||||
| * | Remove duplicate method | Clement Ho | 2017-06-09 | 1 | -6/+0 |
| | | |||||
| * | resolve more inconsistencies | Mike Greiling | 2017-06-09 | 2 | -19/+1 |
| | | |||||
| * | Resolve inconsistencies | Clement Ho | 2017-06-09 | 4 | -201/+0 |
| | | |||||
| * | Merge commit 'b1bf6d88fceb24663bfe4be2d9cc111710d9126b' into 9-3-stable | Clement Ho | 2017-06-09 | 27 | -128/+507 |
| |\ | |||||
| | * | Merge branch 'master-security-update' into 'master' | Regis Boudinot | 2017-06-08 | 28 | -41/+748 |
| | |\ | | | | | | | | | | | | | Master security update See merge request !12025 | ||||
| | | * | Merge remote-tracking branch 'origin/upstream-9-2-security' into ↵master-security-update | DJ Mountney | 2017-06-08 | 1 | -5/+7 |
| | | |\ | | | | | | | | | | | | | master-security-update | ||||
| | | | * | Update rename_system_namespace_spec to new validations.upstream-9-2-security | Bob Van Landuyt | 2017-06-08 | 1 | -5/+7 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |