summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'remove_unecessary_rake_task' into 'master'Dmitriy Zaporozhets2015-06-034-62/+36
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitlab:env:check task. Rake task that checks for git user git settings is a leftover from early days. It is not being used by the web editor(and web editor is also being redone atm) so this rake task just causes confusion. Adresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2362 See merge request !758
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
| * | | | | | | | | Fix tests and increase delay time before remove repositoryDmitriy Zaporozhets2015-06-033-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Add tests for project destroy servicerepo-removeDmitriy Zaporozhets2015-06-031-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Move repository when project is removedDmitriy Zaporozhets2015-06-034-27/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ths commit does next: * When we remove project we move repository to path+deleted.git * Then we schedule removal of path+deleted with sidekiq * If repository move failed we abort project removal This should help us with NFS issue when project get removed but repository stayed. The full explanation of problem is below: * rm -rf project.git * rm -rf removes project.git/objects/foo * NFS server renames foo to foo.nfsXXXX because some NFS client (think * Unicorn) still has the file open * rm -rf exits, but project.git/objects/foo.nfsXXX still exists * Unicorn closes the file, the NFS client closes the file (foo), and the * NFS server removes foo.nfsXXX * the directory project.git/objects/ still exists => problem So now we move repository and even if repository removal failed Repository directory is moved so no bugs with project removed but repository directory taken. User still able to create new project with same name. From administrator perspective you can easily find stalled repositories by searching `*+deleted.git` Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | 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>
View Lorry Controller Status