summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/gb/pipeline-retry-only-latest-jobs' into 'master' Kamil Trzciński2017-03-271-0/+13
| | | | | | | Do not retry jobs multiple times when retrying a pipeline Closes #30092 See merge request !10249
* Merge branch 'better-priority-sorting' into 'master'Douwe Maan2017-03-245-4/+94
| | | | | | | | Better priority sorting Closes #28754 See merge request !9938
* Merge branch 'profile-project-pagination-json-fix' into 'master' Jacob Schatz2017-03-241-0/+31
| | | | | | | Fixed pagination in projects & snippets on user page Closes #29624 See merge request !10048
* Merge branch 'filter-bar-fix-ie' into 'master' Filipa Lacerda2017-03-241-1/+1
| | | | | | | Fixed the filter bar not working in IE Closes #29742 See merge request !10149
* Merge branch '22850-404-when-requesting-build-trace' into 'master' Kamil Trzciński2017-03-241-0/+47
| | | | | | | Resolve "404 when requesting build trace" Closes #22850 See merge request !9759
* Merge branch 'fix-ci-api-regression-for-after-script' into 'master' Kamil Trzciński2017-03-242-2/+2
| | | | | Fix after_script processing for Runners APIv4 See merge request !10185
* Merge branch 'tc-fix-project-create-500' into 'master'Douwe Maan2017-03-212-0/+16
| | | | | | | Fix for creating a project through API when import_url is nil Closes #29121 See merge request !9841
* Merge branch '29583-routes-like-fix' into 'master' Sean McGivern2017-03-212-4/+31
| | | | | | | Escape route path for LIKE queries Closes #29583 See merge request !10117
* Merge branch 'revert-37328406' into 'master' Rémy Coutable2017-03-212-35/+0
| | | | | | | Revert "Merge branch '29534-todos-performance' into 'master'" Closes #29758 See merge request !10116
* Merge branch ↵Rémy Coutable2017-03-211-2/+2
| | | | | | | | | | '29302-improve-the-prometheus-queries-for-multiple-container-environments' into 'master' Resolve "Fix the Prometheus queries for multiple container environments" Closes #29302 See merge request !9949
* Merge branch 'sh-fix-issue-29739' into 'master' Sean McGivern2017-03-211-0/+11
| | | | | | | Fix Error 500 when Bitbucket importer does not have authorization Closes #29739 See merge request !10105
* Merge branch 'gitaly-install-rake' into 'master'Robert Speicher2017-03-212-3/+78
| | | | | | | | Docs and scripts to install Gitaly from source Closes gitaly#136 and #28446 See merge request !9941
* Merge branch 'source-branch-toggle-text' into 'master' Filipa Lacerda2017-03-211-0/+6
| | | | | | | Fixed source branch name not being in new merge request dropdown toggle Closes #29660 See merge request !10080
* Merge branch 'api-project-issues-404' into 'master' Sean McGivern2017-03-212-0/+12
| | | | | | | Return 404 in project issues API endpoint when project cannot be found Closes #29631 See merge request !10093
* Merge branch 'create-branch-service-create-file' into 'master' Sean McGivern2017-03-211-0/+24
| | | | | | | Fix CreateBranchService after Repository#commit_file was renamed to create_file Closes #29687 See merge request !10081
* Merge branch 'dz-hide-share-group-ancestors' into 'master' Douwe Maan2017-03-211-1/+23
| | | | | | | Hide ancestor groups in the share group dropdown list Closes #29311 See merge request !9965
* Merge branch ↵Sean McGivern2017-03-214-9/+76
| | | | | | | | | | '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-cloning-project-wikis' into 'master' Fix ProjectWiki#http_url_to_repo signature Closes #29685 See merge request !10079
* Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' Kamil Trzciński2017-03-211-0/+18
| | | | | | | Fix pipeline status for transition between stages Closes #29699 See merge request !10094
* Merge branch 'reset-filters-after-click' into 'master' Alfredo Sumaran2017-03-211-0/+20
| | | | | | | Reset filters after click Closes #28463 See merge request !10024
* Merge branch '29559-issue-count' into 'master'Filipa Lacerda2017-03-211-0/+15
| | | | | | | | handle commas in Issue total count Closes #29559 See merge request !10028
* Merge branch 'add-filter-focus-style' into 'master' Alfredo Sumaran2017-03-211-0/+12
| | | | | Add filter focus for filtered search visual tokens See merge request !9875
* Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-213-0/+56
| | | | | | | Fix Error 500 when application settings are saved Closes #29674 and #29115 See merge request !10070
* Merge branch 'rs-issue-29592' into 'master' Stan Hu2017-03-211-2/+10
| | | | | | | Handle Route#name being nil after an update Closes #29592 See merge request !10102
* Merge branch '9-0-stable' into 9-0-stable-devLin Jen-Shin2017-03-205-18/+101
|\ | | | | | | | | | | | | | | | | | | * 9-0-stable: Merge branch 'protobuf-3.2.0.2' into 'master' Merge branch '28890-allow-creating-mr-without-target-branch-in-url' into 'master' Merge branch '24683-sidebar-spinners' into 'master' Merge branch '29534-todos-performance' into 'master' Merge branch '29586-pipelines-tabs' into 'master' Merge branch 'fix/regressions-in-ci-v4-api' into 'master'
| * Merge branch '28890-allow-creating-mr-without-target-branch-in-url' into ↵Sean McGivern2017-03-202-2/+4
| | | | | | | | | | | | | | | | | | | | 'master' Allow creating merge request even if target branch is not specified in query params Closes #28890 See merge request !9968
| * Merge branch '29534-todos-performance' into 'master' Sean McGivern2017-03-202-0/+35
| | | | | | | | | | Todos performance: Include associations in Finder See merge request !10076
| * Merge branch 'fix/regressions-in-ci-v4-api' into 'master' Kamil Trzciński2017-03-201-16/+62
| | | | | | | | | | Fix regressions introduced while adding CI endpoints in API v4 See merge request !9952
* | Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-172-0/+36
| | | | | | | | | | fix for render json include leaks See merge request !2074
* | Merge branch 'ssrf' into 'security' Douwe Maan2017-03-173-0/+65
| | | | | | | | | | Protect server against SSRF in project import URLs See merge request !2068
* | Merge branch '28058-hide-emails-in-atom-feeds' into 'security'Rémy Coutable2017-03-172-11/+15
|/ | | | | | Only show public emails in atom feeds See merge request !2066
* Merge branch 'all-ci-offline-migrations' into 'master' Robert Speicher2017-03-1719-368/+133
| | | | | All CI offline migrations See merge request !9730
* Merge branch 'database-config-method' into 'master' Rémy Coutable2017-03-171-4/+10
| | | | | Added Gitlab::Database.config See merge request !10045
* Merge branch '29604-v3-fix-branch-creation' into 'master' Sean McGivern2017-03-171-0/+52
| | | | | | | Use "branch_name" instead "branch" on V3 branch creation API Closes #29604 See merge request !10030
* Merge branch '20121-add-a-new-have_html_escaped_body_text-matcher' into 'master'Robert Speicher2017-03-172-57/+63
| | | | | | | | Add a new have_html_escaped_body_text that match an HTML-escaped text Closes #20121 See merge request !10015
* Merge branch 'fix-slow-queries-for-branches-index' into 'master'Douwe Maan2017-03-173-0/+31
| | | | | | removes n+1 query from tags and branches indexes See merge request !9905
* Merge branch '27376-cache-default-branch-pipeline-on-project' into 'master'Yorick Peterse2017-03-176-2/+268
| | | | | | Speed up several project lists See merge request !9903
* Merge branch ↵Rémy Coutable2017-03-171-0/+6
| | | | | | | | | | '29565-name-of-the-uncompressed-folder-of-a-tag-archive-changed' into 'master' Fix archive prefix bug for refs containing dots Closes #29565 See merge request !10007
* Merge branch 'fix-unknown-emojis-in-frequently-used-awards' into 'master' Alfredo Sumaran2017-03-172-0/+50
| | | | | Protect against unknown emojis in frequently used list See merge request !10020
* Merge branch '29529-quick-fix' into 'master' Sean McGivern2017-03-171-1/+14
| | | | | | | Ensure not valid anymore labels don't break issue pages Closes #29529 See merge request !9995
* Merge branch '29534-todos-performance' into 'master' Sean McGivern2017-03-171-0/+23
| | | | | Improve TODOs performance See merge request !10004
* Merge branch 'compare-remote-search' into 'master'Alfredo Sumaran2017-03-171-0/+8
| | | | | | | | Enabled remote filter in compare dropdowns Closes #29545 See merge request !9997
* Merge branch 'tc-clean-up-no-label-doc' into 'master' Sean McGivern2017-03-171-0/+10
| | | | | Put the use of "No Label" in the labels description See merge request !9993
* Merge branch 'fix_relative_position_calculation' into 'master' Douwe Maan2017-03-161-10/+110
| | | | | | | Fix relative position calculation Closes #29269 See merge request !9837
* Merge branch 'zj-rename-ci-vars' into 'master' Achilleas Pipinellis2017-03-168-23/+23
| | | | | Futher rename the CI variables See merge request !9851
* Merge branch 'dz-blacklist--names' into 'master'Douwe Maan2017-03-161-0/+47
| | | | | | | | Blacklist nested groups and project names that can cause ambiguous routing for HA Closes #29324 See merge request !9898
* Preserve order by priority on issues boardValery Sizov2017-03-162-0/+41
|
* Fix regression in runners registration v1 apiTomasz Maczukin2017-03-162-0/+6
|
* Merge branch 'fix-project-without-repo-and-wiki' into 'master' Rémy Coutable2017-03-161-0/+2
| | | | | | | Fix projects without repo and wiki Closes #29542 See merge request !9956
* Backport changes from gitlab-org/gitlab-ee!1406Adam Niedzielski2017-03-161-2/+10
|
* Merge branch 'dm-fix-mailroom-config' into 'master' DJ Mountney2017-03-152-56/+64
| | | | | Fix reply by email by fixing config/mail_room.yml to be interpretable without ActiveSupport See merge request !9979