home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,812 Commits 48 Branches 340 Tags
83e59db55e9bd65a41af69eda893ef39e8fd7aed
Commit Graph
16812 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Job van der Voort 83e59db55e Merge branch 'rs-2fa-docs' into 'master' 
Add 2FA docs

See merge request !757
 2015-06-03 15:05:54 +00:00
Dmitriy Zaporozhets fb59f04fdf Merge branch 'fix-group-remove' into 'master' 
Group improvements

* remove projects before removing group
* execute all hooks/events from project destroy when group removed
* log group create/remove
* delay remove of namespace directory (to prevent NFS issues)

Inspired by !759

See merge request !761
 2015-06-03 15:02:33 +00:00
Dmitriy Zaporozhets 55715735d1 Add CHANGELOG item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 17:01:31 +02:00
Dmitriy Zaporozhets 8046b69761 Merge branch 'remove_unecessary_rake_task' into 'master' 
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
 2015-06-03 14:59:38 +00:00
Dmitriy Zaporozhets e414463d9e Merge branch 'repo-remove' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2015-06-03 16:17:36 +02:00
Dmitriy Zaporozhets 53a0ac4734 Skip repo removing whem remove user or group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 16:16:27 +02:00
Dmitriy Zaporozhets 47a95754de Log group creation and removal 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 16:15:58 +02:00
Marin Jankovski 7044d649a3 Add autocrlf back to installation docs, add a check for it. 2015-06-03 15:42:22 +02:00
Job van der Voort 41ee2aa2d7 fix typo and add screenshots 2015-06-03 15:35:13 +02:00
Dmitriy Zaporozhets 7bab4817f7 Merge branch 'repo-remove' into fix-group-remove 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2015-06-03 15:15:46 +02:00
Dmitriy Zaporozhets 58ab8a4a9d Fix tests and increase delay time before remove repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 15:09:12 +02:00
Dmitriy Zaporozhets 1edff53444 Remove projects before group/user. Remove namespace directory async 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 14:57:12 +02:00
Jacob Vosmaer 15b1bb47ba Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-06-03 14:34:15 +02:00
Jacob Vosmaer e57b27d44f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-03 14:33:45 +02:00
Dmitriy Zaporozhets 61cfd1d273 Wrap group removal into service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 14:07:20 +02:00
Job van der Voort 8d24b9354a Merge branch 'ldap-email-attribute' into 'master' 
LDAP users should not control their LDAP email

If they can, they can take over arbitrary GitLab accounts.

See merge request !1837
 2015-06-03 11:58:48 +00:00
Douwe Maan 69630394cf Merge branch 'add-resend-confirmation-email-in-profile' into 'master' 
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
 2015-06-03 11:47:45 +00:00
Jacob Vosmaer 98ff4131cd LDAP users should not control their LDAP email 2015-06-03 13:40:47 +02:00
Dmitriy Zaporozhets fd1723f0fc Add tests for project destroy service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 13:08:17 +02:00
Dmitriy Zaporozhets 97ff86e07c Move repository when project is removed 
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>
 2015-06-03 13:05:43 +02:00
Jeroen van Baarsen c4161cd147 Merge pull request #9349 from lahdekorpi/patch-1 
Remove "(unreleased)" from v 7.11.0
 2015-06-03 12:51:15 +02:00
Marin Jankovski 5f7d6c7d74 Remove gitlab:env:check task. 2015-06-03 11:26:57 +02:00
Dmitriy Zaporozhets 41d4aaa4be Merge branch 'rs-more-js-testing' into 'master' 
More Javascript testing

Continuation of !715

See merge request !736
 2015-06-03 08:13:50 +00:00
Dmitriy Zaporozhets 8631b6a258 Merge branch 'rs-issue-1022' into 'master' 
Push event: Nest link in strong tag, not vice-versa

Closes #1022

See merge request !755
 2015-06-03 08:12:43 +00:00
Stan Hu a38dd9bd3a Add "Resend confirmation e-mail" link in profile settings 
Fixes https://github.com/gitlabhq/gitlabhq/issues/9274
 2015-06-03 00:12:43 -07:00
Robert Speicher 29626b0885 Remove unused showAndHide, simpleFormat, and linkify functions 
Also removes redundant `unbind` call
 2015-06-02 20:32:07 -04:00
Robert Speicher 39d5a4878f Add JS specs for Array extensions 2015-06-02 20:32:07 -04:00
Robert Speicher 4560954404 Move jQuery enable/disable extensions to extensions/jquery 
Removes redundant enableButton/disableButton extensions, and adds specs
for the jQuery extensions.
 2015-06-02 20:32:07 -04:00
Robert Speicher 2313d42b37 Bump jquery-rails version 2015-06-02 20:32:07 -04:00
Robert Speicher f76a3f3db7 Add ZenMode javascript specs 2015-06-02 20:32:07 -04:00
Robert Speicher 42f3626862 Add 2FA docs 
[ci skip]
 2015-06-02 18:39:30 -04:00
Robert Speicher e860dedd1c Push event: Nest link in strong tag, not vice-versa 
Closes #1022
 2015-06-02 15:05:44 -04:00
Dmitriy Zaporozhets 79aac2c128 Merge branch 'ignore-references' into 'master' 
Don't notify users mentioned in code blocks or blockquotes.

cc @rspeicher

See merge request !753
 2015-06-02 18:39:18 +00:00
Douwe Maan 34d176ad57 Merge branch 'rs-more-nofollow' into 'master' 
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! ✨

See merge request !735
 2015-06-02 18:19:01 +00:00
Robert Speicher 9e7a9c63a5 Further limit the limited whitelist for project/group descriptions 2015-06-02 13:41:12 -04:00
Toni Lähdekorpi b49302f2fd Remove "(unreleased)" from v 7.11.0 2015-06-02 20:28:52 +03:00
Robert Speicher 79c4e3899f Rename ReferenceFilterSpecHelper to FilterSpecHelper 
And make it more generalized for all filter specs.
 2015-06-02 13:27:53 -04:00
Robert Speicher 442a0663da Add feature specs for Project and Group description rendering 2015-06-02 13:04:10 -04:00
Robert Speicher 023dd2907b Add a pipeline context option for SanitizationFilter 
When this option is `:description`, we use a more restrictive whitelist.
This is used for Project and Group description fields.
 2015-06-02 13:04:10 -04:00
Robert Speicher 1a52f19c45 Remove now-unused escaped_autolink helper and rails_autolink gem 2015-06-02 13:04:10 -04:00
Robert Speicher 2a5c963b7c Render Group and Project descriptions with our Markdown pipeline 2015-06-02 13:04:10 -04:00
Dmitriy Zaporozhets d85a7437a5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-02 17:26:19 +02:00
Dmitriy Zaporozhets be56144a3d Merge branch 'ci_yml_file' into 'master' 
GitLab CI service sends gitlab-ci.yml file

See merge request !689
 2015-06-02 15:03:07 +00:00
Marin Jankovski c4cb563e98 Merge pull request #8730 from drunkard/master 
Specify shell while run me as git user
 2015-06-02 16:19:31 +02:00
Valery Sizov b931c11e1b GitLab CI service sends gitlab-ci.yml file 2015-06-02 16:46:01 +03:00
Douwe Maan a916936f3f Fix spec. 2015-06-02 15:00:51 +02:00
Douwe Maan 156c43c0dc Add changelog entry. 2015-06-02 13:23:22 +02:00
Douwe Maan 1f908dc481 Fix typo. 2015-06-02 13:21:34 +02:00
Dmitriy Zaporozhets 1c328fa4d7 Improve hover color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 13:20:09 +02:00
Douwe Maan 94919c7ef6 Ignore references in blockquotes. 2015-06-02 13:17:21 +02:00