summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a changelog item.trigger_hooks_create_on_backup_restoreMarin Jankovski2015-06-031-1/+2
* Trigger hooks-create on gitlab backup restore.Marin Jankovski2015-06-031-0/+3
* Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2015-06-031-1/+1
|\
| * Merge pull request #9349 from lahdekorpi/patch-1Jeroen van Baarsen2015-06-031-1/+1
| |\
| | * Remove "(unreleased)" from v 7.11.0Toni Lähdekorpi2015-06-021-1/+1
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJacob Vosmaer2015-06-0316-66/+168
|\ \ \
| * \ \ Merge branch 'add-resend-confirmation-email-in-profile' into 'master'Douwe Maan2015-06-032-2/+6
| |\ \ \
| | * | | Add "Resend confirmation e-mail" link in profile settingsStan Hu2015-06-032-2/+6
| * | | | Merge branch 'rs-more-js-testing' into 'master'Dmitriy Zaporozhets2015-06-0313-62/+160
| |\ \ \ \
| | * | | | Remove unused `showAndHide`, `simpleFormat`, and `linkify` functionsrs-more-js-testingRobert Speicher2015-06-022-15/+0
| | * | | | Add JS specs for Array extensionsRobert Speicher2015-06-021-0/+12
| | * | | | Move jQuery enable/disable extensions to extensions/jqueryRobert Speicher2015-06-026-30/+56
| | * | | | Bump jquery-rails versionRobert Speicher2015-06-022-13/+13
| | * | | | Add ZenMode javascript specsRobert Speicher2015-06-024-4/+79
| | | |/ / | | |/| |
| * | | | Merge branch 'rs-issue-1022' into 'master'Dmitriy Zaporozhets2015-06-031-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Push event: Nest link in strong tag, not vice-versars-issue-1022Robert Speicher2015-06-021-2/+2
| | | |/ | | |/|
* | | | Merge branch 'ldap-email-attribute' into 'master'Job van der Voort2015-06-031-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | LDAP users should not control their LDAP emailJacob Vosmaer2015-06-031-0/+7
|/ / /
* | | Merge branch 'ignore-references' into 'master'Dmitriy Zaporozhets2015-06-027-60/+83
|\ \ \
| * | | Fix spec.ignore-referencesDouwe Maan2015-06-021-6/+15
| * | | Add changelog entry.Douwe Maan2015-06-021-0/+1
| * | | Fix typo.Douwe Maan2015-06-021-1/+1
| * | | Ignore references in blockquotes.Douwe Maan2015-06-023-5/+16
| * | | Actually ignore references in code blocks etc.Douwe Maan2015-06-024-49/+51
* | | | Merge branch 'rs-more-nofollow' into 'master'Douwe Maan2015-06-0226-110/+216
|\ \ \ \ | |_|/ / |/| | |
| * | | Further limit the limited whitelist for project/group descriptionsrs-more-nofollowRobert Speicher2015-06-022-2/+18
| * | | Rename ReferenceFilterSpecHelper to FilterSpecHelperRobert Speicher2015-06-0215-61/+56
| * | | Add feature specs for Project and Group description renderingRobert Speicher2015-06-023-12/+82
| * | | Add a `pipeline` context option for SanitizationFilterRobert Speicher2015-06-025-23/+56
| * | | Remove now-unused `escaped_autolink` helper and rails_autolink gemRobert Speicher2015-06-023-10/+0
| * | | Render Group and Project descriptions with our Markdown pipelineRobert Speicher2015-06-023-6/+8
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-023-0/+30
|\ \ \
| * \ \ Merge branch 'ci_yml_file' into 'master'Dmitriy Zaporozhets2015-06-023-0/+30
| |\ \ \
| | * | | GitLab CI service sends gitlab-ci.yml fileci_yml_fileValery Sizov2015-06-023-0/+30
| |/ / /
* | | | Merge pull request #8730 from drunkard/masterMarin Jankovski2015-06-022-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Improve comments for shell_pathDrunkard Zhang2015-05-041-3/+2
| * | | Specify shell while run me as git userDrunkard Zhang2015-02-042-1/+8
* | | | Improve hover colorDmitriy Zaporozhets2015-06-022-2/+1
| |/ / |/| |
* | | Merge branch 'web-editor-rugged' into 'master'Dmitriy Zaporozhets2015-06-0215-282/+104
|\ \ \
| * | | Remove unnecessary satellite files and add CHANGELOG itemDmitriy Zaporozhets2015-06-024-81/+3
| * | | Make web editor work correctly after switch from satellitesDmitriy Zaporozhets2015-06-025-5/+7
| * | | Remove files in web editor using ruggedDmitriy Zaporozhets2015-06-024-17/+40
| * | | Remove now unnecessary satelittes logic for creating and editing file with we...web-editor-ruggedDmitriy Zaporozhets2015-06-023-143/+0
| * | | Create activity event and execute hooks on web editor commitDmitriy Zaporozhets2015-06-023-3/+11
| * | | Remove file api tests which depend on old satellite logicDmitriy Zaporozhets2015-06-021-32/+3
| * | | Use rugged in web editor for base64 encodingDmitriy Zaporozhets2015-06-012-34/+28
| * | | Allow base64 for edit blobsDmitriy Zaporozhets2015-06-011-2/+2
| * | | Fix adding new file to empty repoDmitriy Zaporozhets2015-06-013-4/+4
| * | | Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-015-17/+62
| | |/ | |/|
* | | Merge branch 'rs-issue-1721' into 'master'Douwe Maan2015-06-022-3/+22
|\ \ \
View Lorry Controller Status