summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Services: code style fixes, minor refactoringservices_refactoring1Valery Sizov2016-07-0618-43/+37
* Merge branch 'allow-disabling-of-git-access-protocol' into 'master' Douwe Maan2016-07-0529-37/+360
|\
| * Use keyword arguments for boolean values and use `span` instead of `a` for cl...allow-disabling-of-git-access-protocolPatricio Cano2016-07-052-6/+6
| * Revert back to not defining a default Git access protocol.Patricio Cano2016-07-056-6/+6
| * Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.Patricio Cano2016-07-053-3/+3
| * Clone button should not be clickable when there is a disabled protocolPatricio Cano2016-07-053-3/+13
| * Default Git access protocol to `web`Patricio Cano2016-07-059-21/+15
| * Rename `enabled_git_access_protocols` to singular.Patricio Cano2016-07-059-14/+15
| * Add `alt` text to the images in the documentation.Patricio Cano2016-07-051-2/+2
| * Don't allow empty strings in the `protocol` check.Patricio Cano2016-07-051-1/+1
| * Correct access control flow for Git HTTP requests.Patricio Cano2016-07-052-6/+12
| * Clarify protocol access check, and make Git HTTP access call more specific.Patricio Cano2016-07-052-7/+7
| * Render the status message with `plain:` so that the message gets passed to th...Patricio Cano2016-07-051-1/+1
| * Render :forbidden *only* if HTTP is disabled.Patricio Cano2016-07-051-1/+5
| * Added documentation on the access restrictions.Patricio Cano2016-07-054-0/+39
| * Return :forbidden if HTTP protocol access is not allowedPatricio Cano2016-07-051-0/+6
| * Raise an error if no protocol is passed to the GitAccess check.Patricio Cano2016-07-052-2/+3
| * Add more tests to the allowed protocols featurePatricio Cano2016-07-052-5/+103
| * Simplify access checksPatricio Cano2016-07-051-1/+7
| * Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ...Patricio Cano2016-07-059-18/+12
| * Only allow Git Access on the allowed protocolPatricio Cano2016-07-058-13/+46
| * Refactor clone button sanitation to its own method to avoid duplication.Patricio Cano2016-07-051-2/+6
| * Fix CSSPatricio Cano2016-07-051-1/+1
| * Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-0512-12/+139
|/
* Merge branch '18593-autofilter-rinku-instrumentation' into 'master' Douwe Maan2016-07-052-0/+3
|\
| * Instrument Rinku usage18593-autofilter-rinku-instrumentationPaco Guzman2016-07-042-0/+3
* | Merge branch '18593-update-rinku' into 'master' Douwe Maan2016-07-052-1/+2
|\ \
| * | Bump Rinku to 2.0.018593-update-rinkuPaco Guzman2016-07-042-1/+2
| |/
* | Merge branch '19161-non-helpful-flash-message-when-attaching-file-fails' into...Fatih Acet2016-07-051-2/+2
|\ \
| * | _Hacked_ in a better error message19161-non-helpful-flash-message-when-attaching-file-failsLuke "Jared" Bennett2016-06-301-2/+2
* | | Merge branch 'underscore-templates' into 'master' Jacob Schatz2016-07-054-16/+16
|\ \ \
| * | | Fix unescaped strings in Underscore templates.underscore-templatesConnor Shea2016-06-294-16/+16
* | | | Merge branch 'ff-markdown-buttons-fix' into 'master' Jacob Schatz2016-07-051-2/+3
|\ \ \ \
| * | | | Fixed markdown buttons in FFff-markdown-buttons-fixPhil Hughes2016-07-051-2/+3
* | | | | Merge branch 'fix-changelog' into 'master' Douwe Maan2016-07-051-2/+0
|\ \ \ \ \
| * | | | | Fix Changelog [ci skip]Connor Shea2016-07-051-2/+0
* | | | | | Merge branch '8-10-guides' into 'master' Robert Speicher2016-07-052-3/+194
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update installation & update guides for 8.10Rémy Coutable2016-07-052-3/+194
* | | | | | Merge branch '18790-dont-show-request-button-to-project-owner' into 'master' Robert Speicher2016-07-0510-87/+115
|\ \ \ \ \ \
| * | | | | | Add a migration to remove requesters that are owners of their project18790-dont-show-request-button-to-project-ownerRémy Coutable2016-07-053-11/+53
| * | | | | | Fix condition in Ability and start with cheaper checksRémy Coutable2016-07-051-7/+7
| * | | | | | New :request_access ability to replace a ugly helperRémy Coutable2016-07-058-87/+73
* | | | | | | Merge branch 'update-gemoji' into 'master' Robert Speicher2016-07-0511-2049/+2069
|\ \ \ \ \ \ \
| * | | | | | | Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemojiConnor Shea2016-06-2911-2049/+2069
* | | | | | | | Merge branch 'doc-custom-githook-ui' into 'master' Achilleas Pipinellis2016-07-054-40/+58
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Change doc location of custom hooksdoc-custom-githook-uiAchilleas Pipinellis2016-07-054-55/+58
| * | | | | | | Follow doc styleguideAchilleas Pipinellis2016-07-052-18/+20
| * | | | | | | Add documentation for custom Git hook error message in GitLab's UIAchilleas Pipinellis2016-07-051-0/+13
* | | | | | | | Merge branch 'project-header' into 'master' Dmitriy Zaporozhets2016-07-056-296/+248
|\ \ \ \ \ \ \ \
| * | | | | | | | Chnaged padding of project header navproject-headerPhil Hughes2016-07-052-3/+3
View Lorry Controller Status