summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Merge branch '27925-fix-mr-stray-pipelines-api-request' into 'master' Filipa Lacerda2017-02-176-8/+25
| | | | | | | Fix stray pipelines API request when showing MR Closes #27925 See merge request !9213
* Merge branch 'zj-remove-deprecated-ci-service' into 'master'Douwe Maan2017-02-175-10/+21
| | | | | | | | Remove deprecated CI service Closes #28094 See merge request !9221
* Merge branch 'zj-fix-url-new-issue-presenter' into 'master' Kamil Trzciński2017-02-171-2/+2
| | | | | Fix project link on issue creation See merge request !9226
* Merge branch '28124-mrs-don-t-show-all-merge-errors' into 'master' Rémy Coutable2017-02-175-18/+50
| | | | | | | Show merge errors in merge request widget Closes #28124 and gitlab-ee#1652 See merge request !9229
* Merge branch '28059-add-pagination-to-admin-abuse-reports' into 'master' Alfredo Sumaran2017-02-173-0/+24
| | | | | | | Restore pagination to admin abuse reports Closes #28059 See merge request !9233
* Merge branch 'snippets-search-performance' into 'master' Yorick Peterse2017-02-174-4/+8
| | | | | Reduce query count for snippet search See merge request !9254
* Merge branch ↵Rémy Coutable2017-02-173-1/+19
| | | | | | | | | '27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects' into 'master' Ensure only commit comments relevant to target project are returned Closes #27873 See merge request !9264
* Merge branch 'fix-rubocop-master' into 'master'Alfredo Sumaran2017-02-171-0/+38
| | | | | | Fix Rubocop offense See merge request !9274
* Merge branch 'fix-8.17-upgrade-process' into 'master' Alfredo Sumaran2017-02-173-15/+46
| | | | | | | Fix 8.17 upgrade documentation Closes #28021 See merge request !9285
* Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master'Douwe Maan2017-02-174-5/+59
| | | | | | Fix a number of race conditions that can occur during namespace deletion See merge request !9294
* Merge branch 'docs/pages-admin' into 'master' Achilleas Pipinellis2017-02-172-156/+248
| | | | | Simplify GitLab Pages admin docs See merge request !9303
* Revert "Merge branch 'docs/pages-admin' into 'master' "Felipe Artur2017-02-172-248/+156
| | | | This reverts commit c824e37f8cc507bb48578c363876de69869cf85a.
* Merge branch '27986-text-spacing' into 'master' Filipa Lacerda2017-02-171-1/+1
| | | | | | | add space between ci text and commit sha in Merge Request widget Closes #27986 See merge request !9308
* Merge branch 'docs/pages-admin' into 'master' Achilleas Pipinellis2017-02-172-156/+248
| | | | | Simplify GitLab Pages admin docs See merge request !9303
* Merge branch 'issue_26714' into 'master'Rémy Coutable2017-02-171-1/+3
| | | | | | | | Fix 'reset-email' link spec Closes #26714 See merge request !9317
* Update VERSION to 8.17.0-rc3v8.17.0-rc3James Lopez2017-02-151-1/+1
|
* Merge branch '27756-fix-json-404-response' into 'master' Clement Ho2017-02-154-5/+28
| | | | | | | Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010
* Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into ↵Douwe Maan2017-02-155-13/+53
| | | | | | | | | | 'master' Make deploy key not show in User's keys list Closes #27480 See merge request !9024
* Merge remote-tracking branch 'origin/8-17-stable' into 8-17-stableRobert Speicher2017-02-14122-477/+841
|\
| * Merge 'dev/8-17-stable' into 8-17-stableRuben Davila2017-02-1415-7/+113
| |\ | |/ |/|
* | Update VERSION to 8.17.0-rc2v8.17.0-rc2Robert Speicher2017-02-141-1/+1
| |
* | Fix migration with missing DOWNTIME entryRuben Davila2017-02-131-0/+2
| |
* | Merge branch 'svg-xss-fix' into 'security' Robert Speicher2017-02-135-3/+40
| | | | | | | | | | Fix for XSS vulnerability in SVG attachments See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2059
* | Merge branch 'fix-github-import-MR-wrong-project' into 'security' Robert Speicher2017-02-132-3/+11
| | | | | | | | | | Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
* | Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-133-0/+29
| | | | | | | | | | Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058
* | Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-133-0/+30
| | | | | | | | | | Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057
| * Remove extra CRLF at the end of the lineRuben Davila2017-02-141-1/+1
| |
| * Merge branch 'issue_27317' into 'master'Alfredo Sumaran2017-02-142-1/+6
| | | | | | | | | | | | | | | | Fix timezone on issue boards due date Closes #27317 See merge request !9150
| * Merge branch '27755-pipeline-docs' into 'master' Achilleas Pipinellis2017-02-143-0/+30
| | | | | | | | | | | | | | Document types of pipelines Closes #22631 See merge request !9008
| * Merge branch '27656-doc-ci-enable-ci' into 'master' Achilleas Pipinellis2017-02-144-9/+13
| | | | | | | | | | | | | | Update doc for enabling or disabling GitLab CI Closes #27656 See merge request !8965