home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 4b7c2f0b50 Merge branch 'bump_gitlab_shell' into 'master' 
gitlab-shell bump to 2.6.4



See merge request !1095
 2015-08-07 08:26:48 +00:00
Dmitriy Zaporozhets a2d6af9772 Merge branch 'explore-markdown' into 'master' 
Apply markdown filter for project descriptions on explore view

When you open the explore page, then the project descriptions are not rendered correctly (e.g., https://gitlab.com/search?search=tortoisegit).

See merge request !1098
 2015-08-07 07:56:13 +00:00
karen Carias bac34a38f6 fixed one line 2015-08-06 22:40:38 -07:00
Stan Hu a1e6fc157f Merge branch 'issue-2216' into 'master' 
Diff colors on MR Discussion like on Changes-tab

Fixes #2216

# Before
![Screen_Shot_2015-08-06_at_21.44.58](https://gitlab.com/gert/gitlab-ce/uploads/ed5935e0713dd58f9cd4b17a1fecaa86/Screen_Shot_2015-08-06_at_21.44.58.png)

# After
![Screen_Shot_2015-08-06_at_21.44.33](https://gitlab.com/gert/gitlab-ce/uploads/0816360afcc7cf860d2eadf8dd63b49e/Screen_Shot_2015-08-06_at_21.44.33.png)

See merge request !1108
 2015-08-07 04:28:10 +00:00
Robert Speicher fb6dc1f07d Add Group#add_* convenience methods 
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
 2015-08-07 00:20:02 -04:00
Dmitriy Zaporozhets 5fb5fd253a Merge branch 'nicer-merge-conflicts-widget' into 'master' 
Split merge conflict messages on 2 lines

Before

![Screenshot_2015-08-06_17.19.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a2757ca0a8f4acbf4152234e050b739e/Screenshot_2015-08-06_17.19.48.png)

After

![Screenshot_2015-08-06_17.22.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/11eeab533f98f008fb9548c0eb039aa3/Screenshot_2015-08-06_17.22.58.png)


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


See merge request !1107
 2015-08-06 20:35:36 +00:00
Gert Goet 3bd503836c Add fix #2216 in CHANGELOG [ci skip] 2015-08-06 21:50:42 +02:00
Gert Goet 7d2259b36f Diff colors on MR Discussion like on Changes-tab 
Fixes #2216
 2015-08-06 21:39:22 +02:00
Dmitriy Zaporozhets c5eb2977d7 Merge branch 'add-current-user-to-autocomplete' into 'master' 
Always add current user to autocomplete controller to support filter by "Me"

### What does this MR do?

This MR always adds the current user to the autocomplete list of users.

### Why was this MR needed?

Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list.

### What are the relevant issue numbers?

Partial fix #2202

See merge request !1100
 2015-08-06 16:10:38 +00:00
Dmitriy Zaporozhets 2c46cf084b Merge branch 'fix-namespace-move-dir' into 'master' 
Ensure old namespace directory exists before moving it

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes #983 

See merge request !1101
 2015-08-06 16:09:11 +00:00
Dmitriy Zaporozhets dcb0bf0df5 Merge branch 'report-spam' 2015-08-06 18:07:36 +02:00
Dmitriy Zaporozhets 69f0defc59 Merge branch 'project-name' into 'master' 
Add project name to project head

I felt that something was missing between the avatar and description.

![Screen_Shot_2015-08-06_at_15.11.41](https://gitlab.com/gitlab-org/gitlab-ce/uploads/35935d81950351118ffbc8002814e411/Screen_Shot_2015-08-06_at_15.11.41.png)

cc @dzaporozhets 

See merge request !1106
 2015-08-06 15:53:22 +00:00
Dmitriy Zaporozhets 485b9efe9f Remove trailing lines 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 17:27:48 +02:00
Dmitriy Zaporozhets ab6aa8a48b Split merge conflict messages on 2 lines 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 17:22:45 +02:00
Douwe Maan 674e1c7458 Fix spec 2015-08-06 17:15:37 +02:00
Dmitriy Zaporozhets 02c4a0cc73 Add tests for abuse report feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 16:57:04 +02:00
Dmitriy Zaporozhets ed7a8c9221 Improve wording in abuse report form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:15:17 +02:00
Dmitriy Zaporozhets 4ba2698810 Remove selectbox from abuse form. Added pagination in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:13:47 +02:00
Douwe Maan e2b4f13b9b Add project name to project head 2015-08-06 15:10:51 +02:00
Dmitriy Zaporozhets 7a9d432cdb Add abuse report management in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:08:22 +02:00
Douwe Maan 9bd074d4cf Use display: inline where appropriate 2015-08-06 14:55:03 +02:00
Dmitriy Zaporozhets cba7f20dc8 Allow users to send abuse reports 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 14:03:27 +02:00
Douwe Maan c015f96ba4 Cache all events 2015-08-06 13:15:33 +02:00
Douwe Maan 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02:00
Dmitriy Zaporozhets d044c14290 Ensure old namespace directory exists before moving it 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 12:31:24 +02:00
Douwe Maan 4f24eb2aa6 Merge branch 'master' into merge-notifs 2015-08-06 12:16:36 +02:00
Douwe Maan c6799b0e1e Update notification docs 2015-08-06 12:16:05 +02:00
Valery Sizov 912233ecd3 Merge branch 'update_changelog_from_stable' into 'master' 
update chnagelog



See merge request !1096
 2015-08-06 09:40:01 +00:00
Douwe Maan fff36a8b89 Merge branch 'fix-link-to-guide' into 'master' 
Replace relative url with full path, remove old reference for indexes

See merge request !1091
 2015-08-06 09:12:51 +00:00
Douwe Maan c6cbee846c Merge branch 'remove-email-from-published-keys' into 'master' 
Only publish ssh key-type and key

Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys)

To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded.

See merge request !850
 2015-08-06 09:05:15 +00:00
Dmitriy Zaporozhets 4b3b286eef Merge branch 'tree-author-at-end' into 'master' 
Put author name at the end of a tree row

Put author name at the end of a tree row as the commit message is more important than the author name.

See merge request !579
 2015-08-06 08:59:25 +00:00
Douwe Maan 863f61343a Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master' 
Fix errors deleting, creating, and viewing graphs using branches with encoded slashes

* Closes #1804
* Closes #1359

See merge request !1084
 2015-08-06 08:29:18 +00:00
Stan Hu 70f5291808 Always add current user to autocomplete controller to support filter by "Me" 
Partial fix #2202
 2015-08-06 00:46:14 -07:00
Sven Strickroth 5d4eec08a1 Apply markdown filter for project descriptions on explore view 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-08-05 21:26:49 +02:00
Achilleas Pipinellis ce47dd4bb0 Update stable branch in installation documentation. Fixes #2191 2015-08-05 21:09:24 +03:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Dmitriy Zaporozhets 6b9dbe9f5a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-05 14:51:24 +02:00
Dmitriy Zaporozhets 58c0c86dbd Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-08-05 14:50:32 +02:00
Dmitriy Zaporozhets 7538be71e0 Merge branch 'update_release_doc' into 'master' 
update release doc



See merge request !1097
 2015-08-05 12:42:03 +00:00
Job van der Voort 72943ee7e2 Merge branch 'server-note' into 'master' 
Added note about changing servers

Because of tweet https://twitter.com/elraro21/status/628650106850516992

See merge request !1919
 2015-08-05 12:39:16 +00:00
Valery Sizov a567dd20d4 update release doc 2015-08-05 14:11:25 +03:00
Valery Sizov fbbfa774c2 update chnagelog 2015-08-05 13:42:27 +03:00
Valery Sizov 99124cece0 gitlab-shell bump to 2.6.4 2015-08-05 13:32:19 +03:00
Kamil Trzciński caf4c0dd87 Merge branch 'ci-skipped-status' into 'master' 
Added support for CI skipped status

This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216


See merge request !1073
 2015-08-05 10:09:07 +00:00
Sytse Sijbrandij 764124c380 Merge branch 'revert_touch' into 'master' 
Revert "Update noteable after a new note is added"

This reverts commit fbdaf0e2a5.

https://gitlab.com/gitlab-org/gitlab-ce/issues/2027

See merge request !1094
 2015-08-05 09:57:27 +00:00
Dmitriy Zaporozhets 1cb8588c66 Remove satellites from requirements docs and add CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-05 11:49:02 +02:00
Dmitriy Zaporozhets c8d00787c2 Merge branch 'add-resend-confirm-email-admin-page' into 'master' 
Add "Confirm user" button to admin page

### What does this MR do?

This MR adds a "Confirm user" to the admin user page.

### Why was this MR needed?

There is no way for an admin to force a user confirmation. Some users create users in the API and then don't have a way to force the user into a confirmed state.

Originally, I attempted to add a link to allow the admin to resend a confirmation e-mail. But that may not be helpful because a user can be in the unconfirmed state with no `unconfirmed_email` set.

### Screenshot

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0571b1e27597289b760a72948ba869e5/image.png)

### What are the relevant issue numbers?

* Closes #2116
* Closes https://github.com/gitlabhq/gitlabhq/issues/9502

See merge request !1067
 2015-08-05 09:43:03 +00:00
Dmitriy Zaporozhets 46a84d8013 Merge branch 'rs-issue-2135' into 'master' 
Update docs for Ruby MRI 2.1 requirement

Addresses #2135 

See merge request !1089
 2015-08-05 09:21:03 +00:00
Dmitriy Zaporozhets 734f97ae11 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-05 11:19:01 +02:00
Dmitriy Zaporozhets 7b4225bdb2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-05 11:18:47 +02:00