Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove Guard | Robert Speicher | 2015-06-03 | 4 | -83/+0 |
* | Merge branch 'rs-2fa-docs' into 'master' | Job van der Voort | 2015-06-03 | 4 | -1/+67 |
|\ | |||||
| * | fix typo and add screenshots | Job van der Voort | 2015-06-03 | 3 | -3/+3 |
| * | Add 2FA docsrs-2fa-docs | Robert Speicher | 2015-06-02 | 2 | -1/+67 |
* | | Merge branch 'fix-group-remove' into 'master' | Dmitriy Zaporozhets | 2015-06-03 | 10 | -8/+93 |
|\ \ | |||||
| * | | Add CHANGELOG item | Dmitriy Zaporozhets | 2015-06-03 | 1 | -0/+1 |
| * | | Skip repo removing whem remove user or group | Dmitriy Zaporozhets | 2015-06-03 | 5 | -11/+63 |
| * | | Log group creation and removal | Dmitriy Zaporozhets | 2015-06-03 | 1 | -0/+4 |
| * | | Merge branch 'repo-remove' into fix-group-remove | Dmitriy Zaporozhets | 2015-06-03 | 7 | -41/+106 |
| |\ \ | |||||
| * | | | Remove projects before group/user. Remove namespace directory asyncfix-group-remove | Dmitriy Zaporozhets | 2015-06-03 | 3 | -2/+19 |
| * | | | Wrap group removal into service | Dmitriy Zaporozhets | 2015-06-03 | 4 | -3/+14 |
| | |/ | |/| | |||||
* | | | Merge branch 'remove_unecessary_rake_task' into 'master' | Dmitriy Zaporozhets | 2015-06-03 | 4 | -62/+36 |
|\ \ \ | |||||
| * | | | Add autocrlf back to installation docs, add a check for it. | Marin Jankovski | 2015-06-03 | 3 | -2/+36 |
| * | | | Remove gitlab:env:check task.remove_unecessary_rake_task | Marin Jankovski | 2015-06-03 | 3 | -62/+2 |
* | | | | Merge branch 'repo-remove' | Dmitriy Zaporozhets | 2015-06-03 | 7 | -41/+106 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix tests and increase delay time before remove repository | Dmitriy Zaporozhets | 2015-06-03 | 3 | -17/+3 |
| * | | | Add tests for project destroy servicerepo-remove | Dmitriy Zaporozhets | 2015-06-03 | 1 | -0/+34 |
| * | | | Move repository when project is removed | Dmitriy Zaporozhets | 2015-06-03 | 4 | -27/+70 |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Jacob Vosmaer | 2015-06-03 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #9349 from lahdekorpi/patch-1 | Jeroen van Baarsen | 2015-06-03 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Remove "(unreleased)" from v 7.11.0 | Toni Lähdekorpi | 2015-06-02 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Jacob Vosmaer | 2015-06-03 | 16 | -66/+168 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'add-resend-confirmation-email-in-profile' into 'master' | Douwe Maan | 2015-06-03 | 2 | -2/+6 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Add "Resend confirmation e-mail" link in profile settings | Stan Hu | 2015-06-03 | 2 | -2/+6 |
| * | | | | Merge branch 'rs-more-js-testing' into 'master' | Dmitriy Zaporozhets | 2015-06-03 | 13 | -62/+160 |
| |\ \ \ \ | |||||
| | * | | | | Remove unused `showAndHide`, `simpleFormat`, and `linkify` functionsrs-more-js-testing | Robert Speicher | 2015-06-02 | 2 | -15/+0 |
| | * | | | | Add JS specs for Array extensions | Robert Speicher | 2015-06-02 | 1 | -0/+12 |
| | * | | | | Move jQuery enable/disable extensions to extensions/jquery | Robert Speicher | 2015-06-02 | 6 | -30/+56 |
| | * | | | | Bump jquery-rails version | Robert Speicher | 2015-06-02 | 2 | -13/+13 |
| | * | | | | Add ZenMode javascript specs | Robert Speicher | 2015-06-02 | 4 | -4/+79 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'rs-issue-1022' into 'master' | Dmitriy Zaporozhets | 2015-06-03 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Push event: Nest link in strong tag, not vice-versars-issue-1022 | Robert Speicher | 2015-06-02 | 1 | -2/+2 |
| | | |/ | | |/| | |||||
* | | | | Merge branch 'ldap-email-attribute' into 'master' | Job van der Voort | 2015-06-03 | 1 | -0/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | LDAP users should not control their LDAP email | Jacob Vosmaer | 2015-06-03 | 1 | -0/+7 |
|/ / / | |||||
* | | | Merge branch 'ignore-references' into 'master' | Dmitriy Zaporozhets | 2015-06-02 | 7 | -60/+83 |
|\ \ \ | |||||
| * | | | Fix spec.ignore-references | Douwe Maan | 2015-06-02 | 1 | -6/+15 |
| * | | | Add changelog entry. | Douwe Maan | 2015-06-02 | 1 | -0/+1 |
| * | | | Fix typo. | Douwe Maan | 2015-06-02 | 1 | -1/+1 |
| * | | | Ignore references in blockquotes. | Douwe Maan | 2015-06-02 | 3 | -5/+16 |
| * | | | Actually ignore references in code blocks etc. | Douwe Maan | 2015-06-02 | 4 | -49/+51 |
* | | | | Merge branch 'rs-more-nofollow' into 'master' | Douwe Maan | 2015-06-02 | 26 | -110/+216 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Further limit the limited whitelist for project/group descriptionsrs-more-nofollow | Robert Speicher | 2015-06-02 | 2 | -2/+18 |
| * | | | Rename ReferenceFilterSpecHelper to FilterSpecHelper | Robert Speicher | 2015-06-02 | 15 | -61/+56 |
| * | | | Add feature specs for Project and Group description rendering | Robert Speicher | 2015-06-02 | 3 | -12/+82 |
| * | | | Add a `pipeline` context option for SanitizationFilter | Robert Speicher | 2015-06-02 | 5 | -23/+56 |
| * | | | Remove now-unused `escaped_autolink` helper and rails_autolink gem | Robert Speicher | 2015-06-02 | 3 | -10/+0 |
| * | | | Render Group and Project descriptions with our Markdown pipeline | Robert Speicher | 2015-06-02 | 3 | -6/+8 |
|/ / / | |||||
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-06-02 | 3 | -0/+30 |
|\ \ \ | |||||
| * \ \ | Merge branch 'ci_yml_file' into 'master' | Dmitriy Zaporozhets | 2015-06-02 | 3 | -0/+30 |
| |\ \ \ | |||||
| | * | | | GitLab CI service sends gitlab-ci.yml fileci_yml_file | Valery Sizov | 2015-06-02 | 3 | -0/+30 |
| |/ / / |