summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* make some sentences a bit shorter, and fix some typoscontributionsSimon Knox2017-04-071-6/+6
|
* small grammar and wording changes, fix TOCSimon Knox2017-04-071-33/+9
| | | | | | - end boss => maintainer - fix heading & link - regenerate docs
* Add merge request discrepancy resolutions to documentation.Jacob Schatz2017-04-071-12/+30
|
* Merge remote-tracking branch 'dev/master'DJ Mountney2017-04-0528-43/+219
|\
| * Merge branch 'open-redirect-fix-continue-to' into 'security' Sean McGivern2017-04-053-1/+13
| | | | | | | | | | Fix for open redirect vuln involving continue[to] params See merge request !2083
| * Merge branch 'open-redirect-host-fix' into 'security' Sean McGivern2017-04-057-3/+37
| | | | | | | | | | Fix for three open redirect vulns using redirect_to url_for(params.merge))) See merge request !2082
| * Merge branch 'path-disclosure-proj-import-export' into 'security' DJ Mountney2017-04-053-1/+17
| | | | | | | | | | Fix for path disclosure in project import/export See merge request !2080
| * Merge branch '29364-private-projects-mr-fix'Sean McGivern2017-04-054-2/+60
| | | | | | | | | | | | Don’t show source project name when user does not have access See merge request !2081
| * Merge branch '30125-markdown-security'Robert Speicher2017-04-0510-36/+68
| | | | | | | | | | | | Remove class from SanitizationFilter whitelist See merge request !2079
| * Update CHANGELOG.md for 8.16.9DJ Mountney2017-04-051-0/+8
| | | | | | [ci skip]
| * Update CHANGELOG.md for 8.17.5DJ Mountney2017-04-051-0/+8
| | | | | | [ci skip]
| * Update CHANGELOG.md for 9.0.4DJ Mountney2017-04-051-0/+8
| | | | | | [ci skip]
* | Merge branch 'issue-title-vue-2' into 'master' Jacob Schatz2017-04-0618-42/+211
|\ \ | |/ |/| | | | | | | | | Issue title realtime Closes #25051 See merge request !10115
| * Issue title realtimeRegis Boudinot2017-04-0618-42/+211
|/
* Merge branch 'gitaly-prevent-autoload' into 'master' Rémy Coutable2017-04-052-18/+34
|\ | | | | | | | | Deal with Rails autoload instance variable resets See merge request !10338
| * Deal with Rails autoload instance variable resetsJacob Vosmaer2017-04-052-18/+34
| | | | | | | | | | | | | | | | Rails auto-load (a development feature) can end up resetting instance variables on classes. This breaks Gitlab::GitalyClient, which uses instance variables to keep global hashes to look up channels and addresses. This change adds code that regenerates the hashes if they suddenly become nil.
* | Merge branch 'tc-fix-unplayable-build-action-404' into 'master' Kamil Trzciński2017-04-0512-7/+95
|\ \ | | | | | | | | | | | | | | | | | | Disable pipeline & environment actions that are not playable Closes #25385 and #24601 See merge request !10052
| * | Adds meaningful description to changelog entrytc-fix-unplayable-build-action-404Filipa Lacerda2017-04-051-1/+1
| | |
| * | Fixes broken lintsFilipa Lacerda2017-04-046-42/+65
| | | | | | | | | | | | Adds js unit tests
| * | Fix typoFilipa Lacerda2017-04-046-4/+47
| | | | | | | | | | | | Adds tests
| * | Buttons will be disabled when playable key is falseFilipa Lacerda2017-04-033-4/+14
| | |
| * | Merge branch 'master' into tc-fix-unplayable-build-action-404Filipa Lacerda2017-04-031323-8689/+22812
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (525 commits) Introduce "polling_interval_multiplier" as application setting fix spelling CI_REPOSITORY_URL (line:355) gitab-ci-token to gitlab-ci-token. Pass Gitaly Repository messages to workhorse Use gitaly 0.5.0 Fix specs Improve specs examples Minor refactor Fix BrachFormatter for removed users Changelog Fix specs One more change to the branch names to preserve metadata Prefixes source branch name with short SHA to avoid collision Fix GitHub importer for PRs of deleted forked repositories Change order of specs Clean history after every test that changes history Clean history state after each test Fixes method not replacing URL parameters correctly Fix a transient failure caused by FFaker Remove unnecessary ORDER BY clause when updating todos Add a wait_for_ajax call to ensure Todos page cleans up properly ...
| * | | Expose if action is playable in JSONToon Claes2017-03-205-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | To avoid a manual build action being played (resulting in a 404), expose `playable?` in the JSON so the frontend can disable/hide the play button if it's not playable.
* | | | Merge branch 'docs/ci-index-page' into 'master' Achilleas Pipinellis2017-04-053-27/+191
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor CI index page Closes #29217 See merge request !9861
| * | | | Separate Scala from Java in CI examplesdocs/ci-index-pageAchilleas Pipinellis2017-04-051-3/+6
| | | | |
| * | | | Fix broken linkAchilleas Pipinellis2017-04-051-2/+2
| | | | |
| * | | | Reorganize CI examples, add more linksMarcia Ramos2017-04-052-46/+143
| | | | |
| * | | | Refactor CI index pageAchilleas Pipinellis2017-04-052-18/+82
| | | | |
* | | | | Merge branch '30195-document-search-param-on-api' into 'master' Sean McGivern2017-04-054-292/+231
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "search" optional param and docs for V4 Closes #30195 See merge request !10358
| * | | | | Add "search" optional param and docs for V430195-document-search-param-on-apiOswaldo Ferreira2017-04-054-292/+231
| | | | | | | | | | | | | | | | | | | | | | | | Notice that this param is being supported since V3, but we have not added the proper docs for it
* | | | | | Merge branch 'workhorse-1.4.3' into 'master' Sean McGivern2017-04-053-10/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workhorse 1.4.3 Closes gitaly#167 and gitaly#177 See merge request !10479
| * | | | | | Remove deprecated field from workhorse responseJacob Vosmaer2017-04-052-9/+2
| | | | | | |
| * | | | | | Use gitlab-workhorse 1.4.3Jacob Vosmaer2017-04-051-1/+1
| | | | | | |
* | | | | | | Merge branch 'convert-poll-interval-to-string' into 'master' Sean McGivern2017-04-052-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert value to string before setting Poll-Interval header See merge request !10477
| * | | | | | | Convert value to string before setting Poll-Interval headerconvert-poll-interval-to-stringAdam Niedzielski2017-04-052-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'dz-fix-group-move' into 'master' Douwe Maan2017-04-053-15/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix subgroup repository disappearance if group was moved Closes #30261 See merge request !10414
| * | | | | | | | Fix subgroup repository disappearance if group was moveddz-fix-group-moveDmitriy Zaporozhets2017-04-053-15/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'gitaly-refs' into 'master'Robert Speicher2017-04-0525-87/+280
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Gitaly refs client See merge request !9291
| * | | | | | | | | Rename {create,inizialize}_raw_repositorygitaly-refsJacob Vosmaer2017-04-051-3/+3
| | | | | | | | | |
| * | | | | | | | | Incorporate Gitaly client for refs serviceAlejandro Rodríguez2017-04-0425-87/+280
| | | | | | | | | |
* | | | | | | | | | Merge branch 'emoji-menu-duplicated-search-icon' into 'master' Filipa Lacerda2017-04-052-2/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the duplicated search icon in emoji menu Closes #30416 and #30016 See merge request !10472
| * | | | | | | | | | Removes the duplicated search icon in emoji menuemoji-menu-duplicated-search-iconPhil Hughes2017-04-052-2/+6
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search emojis title had the same class as the search input which caused a duplicated icon. Closes #30416
* | | | | | | | | | Merge branch 'render-pdfs-in-gitlab' into 'master' Jacob Schatz2017-04-0513-1/+51299
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render PDFs in GitLab See merge request !10419
| * | | | | | | | | Use PDFLab to render PDFs in GitLabSam Rose2017-04-0513-1/+51299
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-polling-query-params' into 'master' Sean McGivern2017-04-051-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how ETag caching middleware handles query parameters See merge request !10482
| * | | | | | | | | Document how ETag caching middleware handles query parametersAdam Niedzielski2017-04-051-0/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'wildcard-routes-in-etag-middleware' into 'master' Sean McGivern2017-04-051-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware See merge request !10478
| * | | | | | | | Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middlewarewildcard-routes-in-etag-middlewareAdam Niedzielski2017-04-051-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NamespaceValidator::WILDCARD_ROUTES is less restrictive than ProjectPathValidator::RESERVED and we really have to avoid only routes that contain wildcard names.
* | | | | | | | Merge branch 'sh-fix-award-emoji-transient-spec' into 'master' Rémy Coutable2017-04-051-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Potential fix for intermittent spec failure in award emoji specs Closes #30399 See merge request !10476
| * | | | | | | | Potential fix for intermittent spec failure in award emoji specssh-fix-award-emoji-transient-specStan Hu2017-04-051-1/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hover and then click seems to make this work more reliably. Closes #30399
View Lorry Controller Status