summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add builds to the docs as a valid skip option for backups.builds_to_backup_docMarin Jankovski2015-10-221-1/+1
|
* Merge branch 'fix-ci-services-editing' into 'master' Robert Speicher2015-10-222-4/+5
|\ | | | | | | | | | | | | Fix 500 when editing CI services Fixes #3090 See merge request !1663
| * Fix 500 when editing CI servicesKamil Trzcinski2015-10-222-4/+5
| |
* | Merge branch 'fail-on-empty-job-name' into 'master' Robert Speicher2015-10-223-15/+38
|\ \ | | | | | | | | | | | | | | | | | | Require jobs to be named This properly presents error for .gitlab-ci.yml having empty job name. See merge request !1662
| * | Require jobs to be namedfail-on-empty-job-nameKamil Trzcinski2015-10-223-15/+38
| | |
* | | Merge branch 'fix-css-for-runner' into 'master' Robert Speicher2015-10-222-27/+26
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix CSS class for runner status Fixes #3117 See merge request !1665
| * | Fix CSS class for runner statusKamil Trzcinski2015-10-222-27/+26
|/ /
* | Update CHANGELOGRobert Speicher2015-10-221-5/+5
|/ | | | [ci skip]
* Merge branch 'bozaro-empty-repo'Douwe Maan2015-10-223-1/+15
|\
| * Fix changelogDouwe Maan2015-10-221-1/+1
| |
| * Show empty repository page if repository don't have branchesArtem V. Navrotskiy2015-10-213-1/+15
| |
* | Merge branch '3147-gitlab-ci-yml-variables-adjust-docs' into 'master' Kamil Trzciński2015-10-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed suggestion in documentation resulting in linting error 'variables should be a map of key-valued strings' Documentation now suggests a valid option with the intended result. See #3147 `"yes"`, opposed to `yes` is not casted to a boolean. `variables` only accepts key-valued strings. Better solution would be to change the parsing of `variables` (allow boolean or check the actual value of the string). See merge request !1660
| * | Fixed linting error 'variables should be a map of key-valued strings'Sander Boom2015-10-211-1/+1
| | |
* | | Merge branch 'dm-issue-3140' into 'master' Robert Speicher2015-10-222-28/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make sure MR refresh service correctly determines newly added commits. Fixes #3140. See merge request !1659
| * | | Clean up MR refresh service somewhat.dm-issue-3140Douwe Maan2015-10-212-28/+48
| | | |
| * | | Make sure MR refresh service correctly determines newly added commits.Douwe Maan2015-10-211-1/+2
| | |/ | |/|
* | | Merge branch 'fix-build-trace-updating' into 'master' Robert Speicher2015-10-223-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix build trace updating Fixes #2910 See merge request !1657
| * | | Fix build trace updatingfix-build-trace-updatingKamil Trzcinski2015-10-213-2/+3
| |/ /
* | | Merge branch 'fix-issue-3094' into 'master' Valery Sizov2015-10-222-41/+45
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show "Add README" link in an empty repository if user doesn't have access to push Reporter users would see this before even though they didn't have access to push: ![image](/uploads/1dd328ab7e58cd00c5b696f079816e16/image.png) It's not complete accurate to include the push command-line instructions, but users may still want the instructions to clone. After: ![image](/uploads/3d214e140916d2f174d0b5fec0ac472d/image.png) Closes #3094 See merge request !1626
| * | Don't show "Add README" link in an empty repository if user doesn't have ↵Stan Hu2015-10-212-41/+45
| | | | | | | | | | | | | | | | | | access to push Closes #3094
* | | Merge branch 'remove-ci-migration' into 'master' Robert Speicher2015-10-216-297/+1
|\ \ \ | |_|/ |/| | | | | | | | Remove CI migration See merge request !1656
| * | Remove CI migration taskremove-ci-migrationKamil Trzcinski2015-10-216-297/+1
| | |
* | | Merge branch 'markdown-tabs-margin' into 'master' Robert Speicher2015-10-211-4/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix margin around Markdown Write/Preview tabs. Reverts !1354 and uses another fix for #2585. See merge request !1654
| * | | Fix margin around Markdown Write/Preview tabs.Douwe Maan2015-10-211-4/+1
| | |/ | |/|
* | | Merge branch 'animated-logo' into 'master' Dmitriy Zaporozhets2015-10-215-10/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animate the logo on hover The logo is now rendered as pure SVG, rather than image referencing a svg. The SVG has an id and the shapes of the logo have a shared class. The shapes change their fill color on hover with a transition. Identical to how it looks on about.gitlab.com cc @skyruler See merge request !1557
| * | | the logo svg should not mess with replacement imgsJob van der Voort2015-10-211-1/+6
| | | |
| * | | Animate the logo on hoverJob van der Voort2015-10-215-13/+43
| | |/ | |/| | | | | | | | | | | | | The logo is now rendered as pure SVG, rather than image referencing a svg. The SVG has an id and the shapes of the logo have a shared class. The shapes change their fill color on hover with a transition.
* | | Merge branch 'full-width-tables' into 'master' Dmitriy Zaporozhets2015-10-2141-677/+708
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make tables full width. ## Before ![Screen_Shot_2015-10-19_at_11.17.32](/uploads/acea66825b41006a949b5cc31cc07699/Screen_Shot_2015-10-19_at_11.17.32.png) ## After ![Screen_Shot_2015-10-19_at_11.19.16](/uploads/ed61e5e6cafe06c5e2d75672f5585c93/Screen_Shot_2015-10-19_at_11.19.16.png) See merge request !1642
| * | Fix duplication between tree_header and tree_contentDouwe Maan2015-10-211-31/+0
| | |
| * | Merge branch 'master' into full-width-tablesDouwe Maan2015-10-2168-225/+715
| |\ \ | | |/
| * | Merge branch 'master' into full-width-tablesfull-width-tablesDouwe Maan2015-10-1935-96/+291
| |\ \
| * | | Make tables full width.Douwe Maan2015-10-1941-678/+708
| | | |
* | | | Merge branch 'fix-mysql-ci-limits-migration' into 'master' Robert Speicher2015-10-213-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure MySQL CI limits DB migrations occur after the fields have been created Closes https://github.com/gitlabhq/gitlabhq/issues/9753 See merge request !1653
| * | | | Ensure MySQL CI limits DB migrations occur after the fields have been createdStan Hu2015-10-213-4/+10
| | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9753
* | | | | Merge branch 'git-archive-improvements-2' into 'master' Douwe Maan2015-10-216-53/+20
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Clear archive cache asynchronously See merge request !1651
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-improvements-2Jacob Vosmaer2015-10-20138-801/+1776
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git-archive-improvements-2
| * | | | | Remove unused sidekiq workerJacob Vosmaer2015-10-201-43/+0
| | | | | |
| * | | | | Clear archive cache asynchronouslyJacob Vosmaer2015-10-205-10/+20
| | | | | |
* | | | | | Merge branch 'add-missing-migrations' into 'master' Robert Speicher2015-10-214-1/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Add missing migrations See merge request !1652
| * | | | | Added extra index for faster enumeration of CI buildsadd-missing-migrationsKamil Trzcinski2015-10-202-1/+7
| | | | | |
| * | | | | Add missing migrationsKamil Trzcinski2015-10-203-1/+11
|/ / / / /
* | | | | Merge branch 'reference-filter-replace-text-nodes-performance' into 'master' Dmitriy Zaporozhets2015-10-203-4/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up searching for text references a bit See merge request !1648
| * | | | | Added benchmark for ReferenceFilterreference-filter-replace-text-nodes-performanceYorick Peterse2015-10-201-0/+41
| | | | | |
| * | | | | Speed up searching for text references a bitYorick Peterse2015-10-202-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a node is ignored there's no need for searching for a given pattern. In turn, when searching for the pattern there's no need to construct a MatchData object as we only care about presence (or lack thereof), not the resulting matches. In terms of performance this cuts down about 200 ms when loading issue #2164 locally, though this varies a bit depending on system load.
* | | | | | Merge branch 'merge-request-deleted-file' into 'master' Dmitriy Zaporozhets2015-10-209-19/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly find last known blob for file deleted in MR. Fixes #3092. When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...". See merge request !1647
| * | | | | | Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-209-19/+38
| | | | | | |
* | | | | | | Merge branch 'handle-no-http-referer' into 'master' Dmitriy Zaporozhets2015-10-2020-43/+133
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to a default path if HTTP_REFERER is not set Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731 See merge request !1646
| * | | | | | | Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-2020-43/+133
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* | | | | | | Merge branch 'rs-8-1-update-guide-changes' into 'master'Robert Speicher2015-10-201-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 8.0-to-8.1 update guide - User needs to update gitlab-git-http-server - User needs to update Nginx configuration [ci skip] See merge request !1625
* | | | | | | Merge pull request #9750 from Bufallo/simplify-patch-updatesStan Hu2015-10-201-3/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Simplify patch version updates (less steps)