summaryrefslogtreecommitdiff
Commit message (Collapse)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.0
| | * 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 settings Adds a convenience link to resend the confirmation e-mail if necessary. Before, user had to logout or open an Incognito Window to do this. Screenshot: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/700e6d98e1c5b58726fbed4e52a09c06/image.png) Fixes https://github.com/gitlabhq/gitlabhq/issues/9274 See merge request !634
| | * | | Add "Resend confirmation e-mail" link in profile settingsStan Hu2015-06-032-2/+6
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/gitlabhq/gitlabhq/issues/9274
| * | | | Merge branch 'rs-more-js-testing' into 'master'Dmitriy Zaporozhets2015-06-0313-62/+160
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More Javascript testing Continuation of !715 See merge request !736
| | * | | | Remove unused `showAndHide`, `simpleFormat`, and `linkify` functionsrs-more-js-testingRobert Speicher2015-06-022-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | Also removes redundant `unbind` call
| | * | | | Add JS specs for Array extensionsRobert Speicher2015-06-021-0/+12
| | | | | |
| | * | | | Move jQuery enable/disable extensions to extensions/jqueryRobert Speicher2015-06-026-30/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes redundant enableButton/disableButton extensions, and adds specs for the jQuery extensions.
| | * | | | 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-versa Closes #1022 See merge request !755
| | * | | Push event: Nest link in strong tag, not vice-versars-issue-1022Robert Speicher2015-06-021-2/+2
| | | |/ | | |/| | | | | | | | | Closes #1022
* | | | Merge branch 'ldap-email-attribute' into 'master'Job van der Voort2015-06-031-0/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | LDAP users should not control their LDAP email If they can, they can take over arbitrary GitLab accounts. See merge request !1837
| * | | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't notify users mentioned in code blocks or blockquotes. cc @rspeicher See merge request !753
| * | | 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
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render Group and Project descriptions with our Markdown pipeline Continuation of !727, this ensures external links in these fields also get `rel="nofollow"` added. Bonus: Emoji now works in them! :sparkles: See merge request !735
| * | | 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
| | | | | | | | | | | | | | | | And make it more generalized for all filter specs.
| * | | 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
| | | | | | | | | | | | | | | | | | | | When this option is `:description`, we use a more restrictive whitelist. This is used for Project and Group description fields.
| * | | 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 file See merge request !689
| | * | | 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
|\ \ \ \ | |/ / / |/| | | Specify shell while run me as git user
| * | | Improve comments for shell_pathDrunkard Zhang2015-05-041-3/+2
| | | |
| * | | Specify shell while run me as git userDrunkard Zhang2015-02-042-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some users disabled "git" user's shell after finished installation, this will lead to "This account is currently not available" and could not run /etc/init.d/gitlab, this dirty trick fix it. Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
* | | | Improve hover colorDmitriy Zaporozhets2015-06-022-2/+1
| |/ / |/| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'web-editor-rugged' into 'master'Dmitriy Zaporozhets2015-06-0215-282/+104
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create and edit files in web editor via rugged - [x] create file via rugged - [x] update file via rugged - [x] remove file via rugged - [ ] fix tests - [x] remove satellites code - [x] create activity event for new/edit file via rugged - [x] base64 support Part of https://dev.gitlab.org/gitlab/gitlabhq/issues/2300 See merge request !751
| * | | Remove unnecessary satellite files and add CHANGELOG itemDmitriy Zaporozhets2015-06-024-81/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Make web editor work correctly after switch from satellitesDmitriy Zaporozhets2015-06-025-5/+7
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Remove files in web editor using ruggedDmitriy Zaporozhets2015-06-024-17/+40
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Remove now unnecessary satelittes logic for creating and editing file with ↵web-editor-ruggedDmitriy Zaporozhets2015-06-023-143/+0
| | | | | | | | | | | | | | | | | | | | | | | | web editor Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Create activity event and execute hooks on web editor commitDmitriy Zaporozhets2015-06-023-3/+11
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Remove file api tests which depend on old satellite logicDmitriy Zaporozhets2015-06-021-32/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use rugged in web editor for base64 encodingDmitriy Zaporozhets2015-06-012-34/+28
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Allow base64 for edit blobsDmitriy Zaporozhets2015-06-011-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix adding new file to empty repoDmitriy Zaporozhets2015-06-013-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-015-17/+62
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'rs-issue-1721' into 'master'Douwe Maan2015-06-022-3/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link_to_gfm with only a reference having the incorrect link Before: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` After: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/foo">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` Closes #192 Closes #1721 Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115) See merge request !739
View Lorry Controller Status