summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "slash command" vs "quick action" conflicts9-3-stable-rc5-autocompleteEric Eastwood2017-06-192-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 Ho2017-06-196-3/+56
| | | | | | | | Disable autocomplete on snippets comments Closes #33594 See merge request !12108
* Merge branch 'enable-autocomplete-on-project-snippets' into 'master'Jacob Schatz2017-06-192-0/+16
| | | | | | | | Enable autocomplete on project snippets Closes #33911 See merge request !12286
* Merge branch 'winh-merge-request-related-issues' into 'master'Fatih Acet2017-06-1910-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 Schatz2017-06-198-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 Pipinellis2017-06-191-1/+13
| | | | | Add info about artifacts object storage in docs See merge request !12208
* Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-195-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 Pipinellis2017-06-191-0/+1
| | | | | Docs permissions for group labels See merge request !12269
* Merge branch 'reduce-sidekiq-wait-timings' into 'master'Rémy Coutable2017-06-193-2/+6
| | | | | Reduce wait timings for Sidekiq jobs See merge request !12270
* Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-195-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-rc4Clement Ho2017-06-191-1/+1
|
* Merge branch '9-3-stable-rc4' into '9-3-stable'Clement Ho2017-06-19177-1215/+2305
|\ | | | | | | | | Prepare 9.3 RC4 See merge request !12260
| * Merge branch 'issue-board-docs' into 'master'Achilleas Pipinellis2017-06-191-2/+3
| | | | | | | | | | Issue board docs See merge request !12197
| * Merge branch 'jira-integ-docs' into 'master'Achilleas Pipinellis2017-06-192-3/+3
| | | | | | | | | | Jira integ docs See merge request !12196
| * Merge branch 'confidential-issues-redesign-docs' into 'master'Achilleas Pipinellis2017-06-192-3/+2
| | | | | | | | | | Confidential issues redesign docs See merge request !12195
| * Merge branch 'convdev-docs' into 'master'Achilleas Pipinellis2017-06-193-1/+31
| | | | | | | | | | Convdev docs See merge request !12189
| * Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master'Jacob Schatz2017-06-191-2/+3
| | | | | | | | | | Update ruby metrics endpoint text to be clearer See merge request !12157
| * Merge branch 'sh-support-cdns' into 'master'Robert Speicher2017-06-192-1/+5
| | | | | | | | | | Support a configurable Rails asset_host to allow for CDNs See merge request !12102
| * Resolve conflicts in job entity specsGrzegorz Bizon2017-06-191-26/+1
| |
| * Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1925-112/+278
| | | | | | | | | | | | | | | | 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 Maan2017-06-195-32/+127
| | | | | | | | | | | | | | Show private subgroups if member of parent group Closes #32135 See merge request !11764
| * Merge branch '33819-authorby' into 'master'Douwe Maan2017-06-191-1/+1
| | | | | | | | | | | | | | correct ByAuthor translation in commit box Closes #33819 See merge request !12256
| * Merge branch '9-3-stable-rc3-i18n' into '9-3-stable-rc4'Clement Ho2017-06-19140-1130/+1949
| |\ |/ / | | | | | | Resolve "Missing translations for the project & repository pages" conflicts See merge request !12243
| * Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18nDouwe Maan2017-06-1627-99/+545
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '9-3-stable-rc3-conflicts-docs' into '9-3-stable-rc3'Achilleas Pipinellis2017-06-1511-90/+161
| |\ | | | | | | | | | | | | Resolve "Add docs for personal access tokens" conflicts See merge request !12194
| | * Fix conflict in doc/api/README.mdAchilleas Pipinellis2017-06-151-8/+3
| | |
| | * Merge branch 'docs/personal-access-tokens' into 'master'9-3-stable-rc3-conflicts-docsSean Packham2017-06-1511-86/+162
| | | | | | | | | | | | | | | | | | | | | | | | Add docs for personal access tokens Closes #31740 and #33261 See merge request !12128
| * | Revert 'New file from interface on existing branch'Douwe Maan2017-06-1528-720/+24
| | |
| * | Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-153-1/+14
| | | | | | | | | | | | | | | | | | | | | Make sure reCAPTCHA configuration is loaded when spam checks are initiated Closes #33532 See merge request !12080
| * | Merge branch '33629-scroll-color' into 'master'Phil Hughes2017-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Change border color of job's scroll controllers to $border-color Closes #33629 See merge request !12129
| * | Merge branch 'gitlab-workhorse-2.1.1' into 'master'Douwe Maan2017-06-151-1/+1
| | | | | | | | | | | | | | | Update gitlab-workhorse to v2.1.1 See merge request !12049
| * | Merge branch '33639-whitespace' into 'master'Phil Hughes2017-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | | Adds back whitespace for job's trace Closes #33639 See merge request !12142
| * | Merge branch 'fix-filename-of-artifact-uploader' into 'master'Grzegorz Bizon2017-06-153-2/+43
| | | | | | | | | | | | | | | | | | | | | 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 Speicher2017-06-154-13/+12
| | | | | | | | | | | | | | | Let PhantomJS load local images See merge request !12003
| * | Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'Kamil Trzciński2017-06-157-31/+77
| | | | | | | | | | | | | | | | | | | | | 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 Speicher2017-06-1527-2/+771
| | | | | | | | | | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
| * | Merge branch 'patch-8' into 'master'Grzegorz Bizon2017-06-151-0/+20
| | | | | | | | | | | | | | | doc: add example of scheduler when See merge request !12067
| * | Merge branch '33469-focus' into 'master'Annabel Dunstone Gray2017-06-152-1/+5
| | | | | | | | | | | | | | | | | | | | | remove outline from More Actions icon when dropdown open Closes #33469 See merge request !12054
| * | Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-152-37/+30
| | | | | | | | | | | | | | | Refactor PostReceive worker to limit merge conflicts See merge request !11916
| * | Merge branch '33466-jobs-navigation-menu' into 'master'Phil Hughes2017-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Highlight jobs menu when we are in jobs page Closes #33466 See merge request !12029
| * | Merge branch 'rs-bootsnap' into 'master'Rémy Coutable2017-06-153-0/+17
| | | | | | | | | | | | | | | | | | | | | Add Bootsnap to all environments to reduce application startup time Closes #33081 See merge request !12034
| * | Merge branch '33467-remove-nicescroll' into 'master'Phil Hughes2017-06-153-48/+59
| | | | | | | | | | | | | | | | | | | | | Remove nicescroll from job trace Closes #33467 and #33427 See merge request !12028
| * | Merge branch 'fall-back-to-gzip-when-missing-optional-deps' into 'master'Marin Jankovski2017-06-151-1/+10
| | | | | | | | | | | | | | | Fall back to gzip when missing optional zopfli dependency See merge request !12068
| * | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-157-56/+36
| | | | | | | | | | | | | | | | | | | | | Raise etag route regex miss Closes #33106 See merge request !12084
| * | Merge branch 'gitaly-0.11.2' into 'master'Stan Hu2017-06-151-1/+1
| | | | | | | | | | | | | | | Use gitaly 0.11.2 See merge request !12092
| * | Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-152-3/+70
| | | | | | | | | | | | | | | | | | | | | 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 Ho2017-06-152-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix autocomplete not working on note edit form Closes #33529 See merge request !12106
| * | Merge branch 'fix-github-clone-wiki' into 'master'Sean McGivern2017-06-152-1/+5
| | | | | | | | | | | | | | | GitHub - Fix token interpolation when cloning wiki repository See merge request !12107
| * | Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-155-5/+25
| | | | | | | | | | | | | | | | | | | | | 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ński2017-06-152-6/+3
| | | | | | | | | | | | | | | | | | | | | Do not expose internal artifacts hash in build entity Closes #33605 See merge request !12124