summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550Robert Speicher2015-08-201-1/+7
* Import sources: settings in the admin interfaceArtem Sidorenko2015-08-202-1/+31
* Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-1911-634/+59
|\
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-171-1/+1
| |\
| * | Refactor pre/post receive commit services into one classDmitriy Zaporozhets2015-08-141-0/+59
| * | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-1110-633/+0
* | | Merge branch 'fix-authhash-infinite-loop' into 'master'Robert Speicher2015-08-181-16/+30
|\ \ \
| * | | Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loopDouwe Maan2015-08-171-16/+30
| | |/ | |/|
* | | Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets2015-08-181-0/+1
|\ \ \
| * | | Clear cache to prevent listing deleted branches after MR removes source branchStan Hu2015-08-141-0/+1
| |/ /
* | | Merge branch 'rs-remove-gfm_with_options' into 'master'Douwe Maan2015-08-171-11/+1
|\ \ \
| * | | Remove the `gfm_with_options` helperrs-remove-gfm_with_optionsRobert Speicher2015-08-121-11/+1
| |/ /
* | | Merge branch 'fix-backslashes-inline-diff' into 'master'Douwe Maan2015-08-171-2/+5
|\ \ \ | |/ / |/| |
| * | Fix bug where backslashes in inline diffs could be droppedStan Hu2015-08-111-2/+5
| |/
* | markup_helper: detect .mkd and .mkdn as markdownBen Boeckel2015-08-121-1/+1
|/
* Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets2015-08-114-0/+210
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-116-0/+423
* Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher2015-08-108-8/+32
|\
| * Add `data-[type]-id` attribute to reference linksrs-reference-data-attrsRobert Speicher2015-08-088-8/+32
* | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-0/+4
|/
* Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-046-19/+68
|\
| * Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-301-2/+11
| * Merge branch 'fix-image-file-is-not-displayed' into 'master'Robert Speicher2015-07-301-2/+3
| |\
| | * Fix the image file that contains non-ascii character is not displayedHiroyuki Sato2015-07-271-2/+3
| * | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqValery Sizov2015-07-292-2/+20
| |\ \
| | * | Fix style pointsGitLab2015-07-282-8/+7
| | * | Send GL_ID to gitlab-git-http-server as JSONGitLab2015-07-281-3/+4
| | * | Handle missing @user during Git HTTP requestsGitLab2015-07-281-1/+10
| | * | Experimental support for gitlab-git-http-serverJacob Vosmaer2015-07-282-2/+11
| * | | Fix bug causing Bitbucket importer to crash when OAuth application had been r...bitbucket-re-authorizeDouwe Maan2015-07-281-6/+15
| | |/ | |/|
| * | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-231-8/+20
| * | Fix Remove source-branch for MRs from same projectDouwe Maan2015-07-221-1/+1
| |/
| * GoogleCode importer: Do not care about casing of image file extensionsSven Strickroth2015-07-201-1/+1
* | Remove satellitesDmitriy Zaporozhets2015-07-156-423/+0
|/
* Merge branch 'fork_visibility_level' into 'master'Dmitriy Zaporozhets2015-07-101-0/+4
|\
| * Fork visibility level fixfork_visibility_levelValery Sizov2015-07-061-0/+4
* | Properly render plain readmeDmitriy Zaporozhets2015-07-091-0/+10
|/
* Reuse HTML Pipeline object in Markdown parserKamil Trzcinski2015-06-301-2/+2
* Fix wrong order of issues when importing from githubHiroyuki Sato2015-06-281-1/+3
* Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-261-1/+1
* Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets2015-06-232-3/+7
|\
| * Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-232-3/+7
* | Make provider a select for identities form in admin areaDmitriy Zaporozhets2015-06-221-0/+19
|/
* Fix behavior of ldap_person method in Gitlab::OAuth::UserAlex Lossent2015-06-171-4/+5
* Dont set checkout sha for removed branch/tagDmitriy Zaporozhets2015-06-151-2/+5
* Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-132-50/+67
* Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-121-1/+2
|\
| * session_expire_seconds => session_expire_delaythemaze752015-06-101-1/+1
| * Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-1/+2
* | Define GITORIOUS_HOST only onceRobert Speicher2015-06-103-4/+5
View Lorry Controller Status