summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Pick !9590 into 8-17-stable8-17-stable-pick-yarn-supportMike Greiling2017-02-281-4/+3
|
* Pick !9316 into 8-17-stableMike Greiling2017-02-287-29/+75
|
* Pick !9055 into 8-17-stableMike Greiling2017-02-286-15/+4327
|
* Update VERSION to 8.17.1v8.17.1James Lopez2017-02-281-1/+1
|
* Update CHANGELOG.md for 8.17.1James Lopez2017-02-2813-48/+15
| | | [ci skip]
* Fix a bad merge conflictRuben Davila2017-02-281-1/+1
|
* Fix Rubocop complain.Ruben Davila2017-02-281-1/+1
| | | | https://gitlab.com/gitlab-org/gitlab-ce/builds/11259594
* Fix migration without DOWNTIME clause specifiedRuben Davila2017-02-281-0/+2
|
* Merge branch 'issue_25112' into 'master'Sean McGivern2017-02-272-0/+19
| | | | | | | | | | Disable invalid service templates Closes #25112 See merge request !8850 Conflicts: db/schema.rb
* Merge branch '28212-avoid-dos-on-build-trace' into 'master' Clement Ho2017-02-272-13/+24
| | | | | | | Replace setInterval with setTimeout to prevent highly frequent requests Closes #28212 See merge request !9271
* Merge branch '27267-events-project-query-performance-regression' into 'master' Sean McGivern2017-02-272-1/+5
| | | | | | | Query performance regression fix affecting "Dashboard::ProjectsController#index.atom" Closes #27267 See merge request !9526
* Merge branch '28357-colon-search' into 'master' Clement Ho2017-02-274-2/+32
| | | | | | | Allow searching issues for strings containing colons Closes #28357 See merge request !9400
* Merge branch 'fix-mr-size-with-over-100-files' into 'master' Sean McGivern2017-02-273-1/+53
| | | | | | | Fix MR changes tab size count Closes #27563 See merge request !9091
* Merge branch '27989-disable-counting-tags' into 'master' Rémy Coutable2017-02-274-4/+10
| | | | | | | Disable unused tags count cache for Projects, Builds and Runners Closes #27989 See merge request !9467
* Merge branch 'pages-0.3.2' into 'master' Robert Speicher2017-02-272-1/+5
| | | | | Pages 0.3.2 See merge request !9474
* Merge branch 'add-issues-tooltip' into 'master'Alfredo Sumaran2017-02-274-5/+51
| | | | | | | | | | Added tooltip to add issues button on issue boards Closes #27985 See merge request !9142 Conflicts: app/assets/javascripts/boards/boards_bundle.js.es6
* Merge branch 'zj-fix-slash-command-labels' into 'master' Douwe Maan2017-02-273-1/+20
| | | | | | | Chat slash commands show labels correctly Closes #28358 See merge request !9408
* Merge branch 'issue_28051_2' into 'master'Sean McGivern2017-02-273-18/+25
| | | | | | | Create compare object with default branch when target branch is missing Closes #28051 See merge request !9263
* Merge branch 'dm-fix-editing-files-on-forks-quick' into 'master' Robert Speicher2017-02-272-37/+44
| | | | | | | Fix issue where files on a fork could not be edited Closes #28188 See merge request !9349
* Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-2735-247/+935
| | | | | | | | | | Spam check and reCAPTCHA improvements Closes #28093 See merge request !9248 Conflicts: app/services/issues/create_service.rb
* Merge branch 'commit-search-ui-fix' into 'master' Annabel Dunstone Gray2017-02-272-1/+5
| | | | | | | Fix the commit search UI Closes gitlab-ee#1765 See merge request !9411
* Merge branch 'hash-concurrent-foreign-key-names' into 'master'Rémy Coutable2017-02-272-0/+132
| | | | | | | | | Hash concurrent foreign key names similar to Rails See merge request !9415 Conflicts: lib/gitlab/database/migration_helpers.rb spec/lib/gitlab/database/migration_helpers_spec.rb
* Merge branch 'zj-improve-performance-user-agent-details' into 'master'Rémy Coutable2017-02-277-9/+45
| | | | | | | | Improve performance of User Agent Detail See merge request !9129 Conflicts: app/views/projects/issues/show.html.haml
* Merge branch 'fix-vue-production-build' into 'master' Jacob Schatz2017-02-271-2/+1
| | | | | Utilize bundler-ready Vue distribution See merge request !9357
* Update VERSION to 8.17.0v8.17.0Felipe Artur2017-02-221-1/+1
|
* Update CHANGELOG.md for 8.17.0Felipe Artur2017-02-22178-714/+180
| | | [ci skip]
* Update VERSION to 8.17.0-rc5v8.17.0-rc5Ruben Davila2017-02-211-1/+1
|
* Merge branch 'dropdown-loading-class-add' into 'master' Filipa Lacerda2017-02-212-1/+4
| | | | | Changes when loading indicator is added to dropdown See merge request !9345
* Merge branch '26881-backup-fails-if-data-changes' into 'master' Douwe Maan2017-02-213-1/+42
| | | | | | | Copy data before compression to prevent 'file changed as we read it' Closes #26881 See merge request !8728
* Merge branch 'updated-pages-0.3.1' into 'master' Robert Speicher2017-02-212-1/+5
| | | | | Update GitLab Pages to v0.3.1 See merge request !9387
* Update VERSION to 8.17.0-rc4v8.17.0-rc4Felipe Artur2017-02-211-1/+1
|
* Merge branch 'dynamic-todos-fixture' into 'master' Clement Ho2017-02-205-6/+59
| | | | | Replace static fixture for right_sidebar_spec.js See merge request !9211
* Merge branch 'merge-request-tabs-fixture' into 'master' Alfredo Sumaran2017-02-204-24/+42
| | | | | Replace static fixture for merge_request_tabs_spec.js See merge request !9172
* Revert "Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master'"Felipe Artur2017-02-204-59/+5
| | | | This reverts commit 1f12aaf22dec5399451305f83095c2e92ef50ab6.
* Revert "Merge branch 'fix-rubocop-master' into 'master'"Felipe Artur2017-02-201-38/+0
| | | | This reverts commit c900aa63186d2fecd851efc2db654760917e88a4.
* Merge branch 'docs/service-templates' into 'master' Achilleas Pipinellis2017-02-202-9/+10
| | | | | | | Update services templates docs Closes gitlab-ee#1361 See merge request !9305
* Merge branch '28313-words' into 'master' Achilleas Pipinellis2017-02-202-5/+5
| | | | | | | Fix job status -> pipeline status Closes #28313 See merge request !9320
* Merge branch 'change_queue_weight' into 'master' Yorick Peterse2017-02-202-1/+5
| | | | | | | Increase process_commit queue weight from 2 to 3 Closes #25828 See merge request !9326
* Merge branch 'remove-issue-and-mr-counts-from-labels-page' into 'master' Stan Hu2017-02-202-6/+8
| | | | | | | Remove issue and MR counts from label index Closes #25413 See merge request !9332
* Merge branch 'fix-merge-service-with-no-source' into 'master' Rémy Coutable2017-02-201-1/+1
| | | | | Fix merge service error with no source See merge request !9348
* Merge branch ↵Rémy Coutable2017-02-203-1/+6
| | | | | | | | | | 'fix_sidekiq_concurrency_warning_message_in_admin_background_job_page' into 'master' fix incorrect sidekiq concurrency count in admin background page Closes #19862 See merge request !9359
* Merge branch ↵Filipa Lacerda2017-02-175-9/+19
| | | | | | | | | | '26824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfold' into 'master' Resolve "Diff unfold link is still visible when there are no lines to unfold" Closes #26824 and #28127 See merge request !8761
* Merge branch '27886_rebasing_fix' into 'master'Sean McGivern2017-02-172-10/+37
| | | | | | | Mark as WIP based on MR commits only Closes #27886 See merge request !9085
* Merge branch 'add-issues-button-disable' into 'master' Fatih Acet2017-02-172-1/+7
| | | | | | | Disables add issue button Closes #27931 See merge request !9100
* Merge branch '27932-merge-request-pipelines-displays-json' into 'master' Alfredo Sumaran2017-02-173-1/+23
| | | | | | | Adds `.json` to the endpoint requested in order to avoid showing JSON Closes #27932 See merge request !9105
* Merge branch '27922-cmd-click-todo-doesn-t-work' into 'master' Alfredo Sumaran2017-02-175-18/+112
| | | | | | | Fix regression where cmd-click stopped working for todos and merge request tabs Closes #27922 See merge request !9115
* Merge branch ↵Filipa Lacerda2017-02-173-0/+21
| | | | | | | | | | '27883-autocomplete-seems-to-not-trigger-when-at-character-is-part-of-an-autocompleted-text' into 'master' Trigger at.js after selecting slash commands with autocomplete suffix Closes #27883 See merge request !9117
* Merge branch '27963-tooltips-jobs' into 'master' Annabel Dunstone Gray2017-02-173-5/+15
| | | | | | | Fixes tooltips in mini pipeline graph Closes #27963 and #28008 See merge request !9140
* Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-175-32/+49
| | | | | | | Fix import webhooks performance issue Closes #27958 See merge request !9197
* Merge branch 'docs/builds-to-jobs-massacre' into 'master' Achilleas Pipinellis2017-02-1763-773/+789
| | | | | Rename builds to jobs in docs See merge request !9204