summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added GitLab restart required help block to session_expire_secondsthemaze75/gitlab-ce-feature-session-expire-seconds-uithemaze752015-06-051-1/+2
* Add session expiration delay configuration through UI applicationEric Maziade2015-06-0510-4/+21
* Merge branch 'rs-issue-1741' into 'master'Dmitriy Zaporozhets2015-06-0413-93/+20
|\
| * Show key fingerprint on DeployKeys#indexrs-issue-1741Robert Speicher2015-06-035-15/+16
| * Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-038-78/+4
|/
* Merge branch 'rs-2fa-docs' into 'master'Job van der Voort2015-06-034-1/+67
|\
| * fix typo and add screenshotsJob van der Voort2015-06-033-3/+3
| * Add 2FA docsrs-2fa-docsRobert Speicher2015-06-022-1/+67
* | Merge branch 'fix-group-remove' into 'master'Dmitriy Zaporozhets2015-06-0310-8/+93
|\ \
| * | Add CHANGELOG itemDmitriy Zaporozhets2015-06-031-0/+1
| * | Skip repo removing whem remove user or groupDmitriy Zaporozhets2015-06-035-11/+63
| * | Log group creation and removalDmitriy Zaporozhets2015-06-031-0/+4
| * | Merge branch 'repo-remove' into fix-group-removeDmitriy Zaporozhets2015-06-037-41/+106
| |\ \
| * | | Remove projects before group/user. Remove namespace directory asyncfix-group-removeDmitriy Zaporozhets2015-06-033-2/+19
| * | | Wrap group removal into serviceDmitriy Zaporozhets2015-06-034-3/+14
| | |/ | |/|
* | | Merge branch 'remove_unecessary_rake_task' into 'master'Dmitriy Zaporozhets2015-06-034-62/+36
|\ \ \
| * | | Add autocrlf back to installation docs, add a check for it.Marin Jankovski2015-06-033-2/+36
| * | | Remove gitlab:env:check task.remove_unecessary_rake_taskMarin Jankovski2015-06-033-62/+2
* | | | Merge branch 'repo-remove'Dmitriy Zaporozhets2015-06-037-41/+106
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix tests and increase delay time before remove repositoryDmitriy Zaporozhets2015-06-033-17/+3
| * | | Add tests for project destroy servicerepo-removeDmitriy Zaporozhets2015-06-031-0/+34
| * | | Move repository when project is removedDmitriy Zaporozhets2015-06-034-27/+70
* | | | 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