home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3d9cbc5dcb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-15 12:44:59 +03:00
Dmitriy Zaporozhets 400c9c5ae2 Revert "Removed help link from sidebar" 
This reverts commit 6fe26e3e46.
 2015-04-15 12:12:58 +03:00
Douwe Maan 63b21945d2 Merge branch 'google-code-import' into 'master' 
Import projects from Google Code.

Resolves #1257.

Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( ♥️ @o9000).

### To do

- [x] List projects from Google Takeout file
- [x] Import Git repository
- [x] Import issues
- [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50)
- [x] Handle deleted attachments
- [x] Handle blockedOn attribute
- [x] Add directions on how to get data from Google Takeout

### Import instructions

![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png)

### Imported issue

![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png)

See merge request !471
 2015-04-15 06:53:42 +00:00
Dmitriy Zaporozhets 0a0d6050fc Merge pull request #8905 from jasonblanchard/remove-truncation-milestone 
Remove truncation from issue titles on milestone page
 2015-04-15 09:22:46 +03:00
Ben Bodenmiller f517dd2606 fix stuck mr 
fixes #348. related to 6487419364.
 2015-04-14 23:11:13 -07:00
Douwe Maan 36b54fc04f Don't crash when project repository doesn't exist. 2015-04-14 23:26:53 +02:00
Douwe Maan 88c2639356 Remove superfluous info from invite accepted/declined mails. 2015-04-14 23:06:21 +02:00
Douwe Maan c1531fe1d8 Add spinach tests around accepting and declining invitations. 2015-04-14 18:04:29 +02:00
Dmitriy Zaporozhets afb43a8fcd Use smae background for git clone text and project visibility 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-14 18:29:20 +03:00
Dmitriy Zaporozhets 09eea7ea84 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-14 18:13:38 +03:00
Douwe Maan 6157dad9ff Merge branch 'master' into 'master' 
Fix error message

This merge request fixes issue when somebody try to import repository (to which that user can't add deploy keys) and has no feedback.

See merge request !518
 2015-04-14 15:08:58 +00:00
Dmitriy Zaporozhets 5262ba3c9a Default buttons should look the same on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-14 17:45:43 +03:00
Douwe Maan 5662b24132 Don't use HTML ellipsis in EmailsOnPush subject truncated commit message. 2015-04-14 16:32:11 +02:00
Dmitriy Zaporozhets dab1824679 Align project download button with others in sidebar on project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-14 17:08:01 +03:00
Dmitriy Zaporozhets 0c6217e2dc Add border radius and shadow to project avatar on project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-14 16:40:59 +03:00
Dmitriy Zaporozhets 29970204ea Fix button overflow for branches/tags pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-14 16:26:47 +03:00
Jason Blanchard f543f1c3dd Remove truncation from issue titles on milestone page 2015-04-14 09:17:57 -04:00
Douwe Maan cb5362e7ce Follow newline guidelines. 2015-04-14 15:16:00 +02:00
Dmitriy Zaporozhets bf7932bd06 Merge branch 'dir-traversal' into 'master' 
Fix directory traversal vulnerabilities

Fixes gitlab/gitlab-ee#272.

As @joern mentions:

> This is not exploitable via the front-end nginx. But nevertheless this issue should be addressed.

See merge request !1760
 2015-04-14 13:07:27 +00:00
Douwe Maan 1abda4458e "interpunction" -> "punctuation" 2015-04-14 14:59:10 +02:00
Douwe Maan 4c6ce0ef78 Move Specify user map button to paragraph. 2015-04-14 14:57:15 +02:00
Douwe Maan dba63d667d Allow user map to be specified. 2015-04-14 14:50:56 +02:00
Senorsen 7b28218f96 Allow user to choose which email to be public 
This commit allows user to show one of their emails in profile page,
or don't show email in this page.
 2015-04-14 19:42:48 +08:00
Douwe Maan 5e2f25c32e Add explanation to HelpController#clean_path_info. 2015-04-14 13:07:15 +02:00
Douwe Maan c26b001ebc Set EmailsOnPush reply-to address to committer email when enabled. 2015-04-14 12:52:33 +02:00
Douwe Maan 0013ea5130 Remove duplication between Group and ProjectMember. 2015-04-14 12:41:19 +02:00
Douwe Maan a8b462bbfe Clear up InvitesController member lookup logic. 2015-04-14 12:25:47 +02:00
Douwe Maan 1c0b58a799 Remove duplication from InvitesController. 2015-04-14 12:25:38 +02:00
Douwe Maan 1b5c483d89 Consistently use "invitation" rather than "invite" in text. 2015-04-14 12:25:16 +02:00
Douwe Maan e50556fcc8 Let invites be declined. 2015-04-14 12:08:11 +02:00
Douwe Maan 405df43558 Use "Sign out" instead of "Logout" for consistency. 2015-04-14 12:08:11 +02:00
Douwe Maan 1c0824f451 Correctly import invited members. 2015-04-14 12:08:11 +02:00
Douwe Maan 2a45eb6a91 Use notice flash type rather than nonexistent info. 2015-04-14 12:08:11 +02:00
Douwe Maan 453340d449 Let membership invitations be resent. 2015-04-14 12:08:10 +02:00
Douwe Maan 87dd3f215f Let members be invited from Add members pane. 2015-04-14 12:08:10 +02:00
Douwe Maan 717fa136a5 Add emails around invitation. 2015-04-14 12:08:10 +02:00
Douwe Maan 39f389ae0f Add invites controller. 2015-04-14 12:07:33 +02:00
Douwe Maan 90dafe31c4 Only show invited users to people who can admin group. 2015-04-14 12:07:33 +02:00
Douwe Maan 2a1d4255da Correctly render invite members without user. 2015-04-14 12:07:33 +02:00
Douwe Maan cee98f2247 Reference project members by id instead of user_id. 2015-04-14 12:06:43 +02:00
Douwe Maan 629fa7fbe3 Add invite logic to Member. 2015-04-14 12:06:43 +02:00
Douwe Maan 2b2bd402dc Track who created a group or project member. 2015-04-14 12:06:42 +02:00
Douwe Maan ff3caad4ca Rename manage_group ability to admin_group for consistency with project. 2015-04-14 12:05:49 +02:00
Douwe Maan 1221bec56c Refactor key fingerprint generation. 2015-04-14 12:00:43 +02:00
Douwe Maan ae6d0aaae0 Revert "Merge branch 'fix-stuck-mr' into 'master'" 
This reverts commit 79b4d0b0c0, reversing
changes made to a1e147ce22.
 2015-04-14 11:03:23 +02:00
Dmitriy Zaporozhets 6b479b6cb0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-14 11:55:10 +03:00
Douwe Maan 36537c65e3 Merge branch 'revert_fix_email_images' into 'master' 
Revert "Merge branch 'fix_email_images' into 'master'"

This reverts commit d66148ef39, reversing
changes made to cdb64a81a8.

This change needed to be reverted,
because not enough email clients support inline images.

/cc @DouweM As discussed before. I'll try to create a MR to allow access to all images this week. I'm a bit busy at the moment so no guarantees. ;)

See merge request !513
 2015-04-14 08:44:24 +00:00
Zbigniew Motyka bf2db3ec03 Fix error message 2015-04-14 10:20:07 +02:00
Douwe Maan 79b4d0b0c0 Merge branch 'fix-stuck-mr' into 'master' 
fix stuck MR

If `locked_at` is `nil` return that the merge has been locked long enough and those are old merges stuck in locked state.

Fixes #348. Related to 6487419364.

See merge request !517
 2015-04-14 07:48:29 +00:00
Dmitriy Zaporozhets 4632983c8c Merge branch 'rs-link-to-performance' into 'master' 
Speed up the overridden `link_to` helper

Only bothers to check the provided link's external status if it's a String that doesn't begin with a path or anchor character.

See merge request !1767
 2015-04-14 07:33:09 +00:00