home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,189 Commits 48 Branches 340 Tags
00a33d67aa5dfcfbc63182106162041d2c60f4de
Commit Graph
1919 Commits
Author SHA1 Message Date
Stan Hu 2379057002 Provide more feedback what went wrong if HipChat service failed test 
Issue gitlab-com/support-forum#213
 2015-08-12 07:31:25 -07:00
Dmitriy Zaporozhets fed202f677 Merge branch 'grit_blame' into 'master' 
Fast blame

Improve performance for file blame page. Also bring some small UI improvements

See merge request !1129
 2015-08-11 14:45:54 +00:00
Dmitriy Zaporozhets d4cfa0bf76 Revert "Refactor web editor" 
This reverts commit dfccb06dda.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:49:09 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Valery Sizov 5bdcdf5616 Fast blame 2015-08-11 09:15:00 +03:00
Douwe Maan 0c31701932 Merge branch 'bitbucket-show-incompatible' into 'master' 
Show incompatible projects in Bitbucket import status

### What does this MR do?

This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table.

### Why was this MR needed?

Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fa).

### Screenshot

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

### What are the relevant issue numbers?

#1871

See merge request !1114
 2015-08-07 14:46:05 +00:00
Stan Hu d7accda1ae Show incompatible projects in Bitbucket import status 
See #1871
 2015-08-07 07:07:08 -07:00
Douwe Maan ad55f0d6f9 Merge branch 'master' into comment-updated-by 2015-08-07 15:05:17 +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 dcb0bf0df5 Merge branch 'report-spam' 2015-08-06 18:07:36 +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 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
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 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02: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
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Stan Hu 0c1ccda43f Add "Confirm user" button in user admin page 
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
 2015-08-05 00:35:53 -07:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Stan Hu 208e07fe6f Fix errors deleting and creating branches with encoded slashes 
Closes #1804
 2015-08-01 23:33:33 -07:00
Douwe Maan bdb4288ab8 Merge branch 'mention-name-in-flash-msg' into 'master' 
Mention group and project names in flash messages upon create, update and delete.

Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency.

**Before**

![project_created](https://gitlab.com/axil/gitlab-ce/uploads/b91b92e46b08d6c566acee8d88fccff1/project_created.png)

**After**

![project_created_after](https://gitlab.com/axil/gitlab-ce/uploads/56db5125f2769386c43cf9e2f175a54d/project_created_after.png)

See merge request !1070
 2015-07-31 13:29:38 +00:00
Douwe Maan 3307008499 Merge branch 'admin-group-member' into 'master' 
Add specific ability for managing group members

To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue)

See merge request !1059
 2015-07-31 13:25:53 +00:00
Douwe Maan 04f2da3c37 Merge branch 'master' into comment-updated-by 2015-07-31 14:29:23 +02:00
Douwe Maan 0736f348a6 Use before_actions 2015-07-31 14:15:49 +02:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Achilleas Pipinellis feb2865fba Raise alert when group is deleted. 
This change was made to match the project deletion.
 2015-07-30 14:11:26 +03:00
Stan Hu 369275d630 Fix network graph when branch name has single quotes 
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
 2015-07-29 23:29:47 -07:00
Achilleas Pipinellis 0fac66f84d Mention group and project name in flash messages upon create, update and delete. 2015-07-30 01:22:16 +03:00
Douwe Maan f9bcb9632c Add specific ability for managing group members 2015-07-28 16:32:15 +02:00
Douwe Maan 42ebd902de Fix bug causing Bitbucket importer to crash when OAuth application had been removed. 2015-07-28 15:33:16 +02:00
Stan Hu 562242cb9d Fix commit data retrieval when branch name has single quotes 
Closes #1724
 2015-07-26 03:47:01 -07:00
Douwe Maan 70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02:00
Stan Hu 643557dabc Fix 404 error in files view after deleting the last file in a repository 
Closes #1362
 2015-07-21 14:12:43 -07:00
Valery Sizov c61e7dd4ac Public project activity page asks for sign-in 2015-07-20 13:54:56 +03:00
Stan Hu df2bb60f90 Add support for destroying project milestones 
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
 2015-07-17 06:54:32 -07:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:03:07 +02:00
Dmitriy Zaporozhets 26f5d6047d Refactor compare and fetch logic 2015-07-15 17:28:09 +02:00
Dmitriy Zaporozhets 2a6f522cac Implement merge from forks without satellites 2015-07-15 16:45:50 +02:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Dmitriy Zaporozhets 5f34759ecb Allow user to specify content he wants to see on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 18:24:15 +02:00
Dmitriy Zaporozhets 171d6fccae Merge branch 'rs-disable-2fa-by-admin' into 'master' 
Allow admins to disable 2FA for a user

> ![Screen_Shot_2015-07-10_at_5.19.13_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3f9bb7c783110d2689c282879cb4b061/Screen_Shot_2015-07-10_at_5.19.13_PM.png)

Depends on !961

See merge request !962
 2015-07-13 08:49:46 +00:00
Dmitriy Zaporozhets d93da8bed5 Merge branch 'rs-disable-2fa' into 'master' 
Add User#disable_two_factor!

This method encapsulates all the logic for disabling 2FA on a specific
User model.

See merge request !961
 2015-07-13 08:47:55 +00:00
Dmitriy Zaporozhets 10d5da784b Merge branch 'fix-api-project-transfer' into 'master' 
Fix transferring of project to another group using the API.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2397.

See merge request !926
 2015-07-13 08:42:42 +00:00
Marin Jankovski 64c57502b6 Merge branch 'hsts-check-port-443' into 'master' 
Only enable HSTS header for HTTPS and port 443

### What does this MR do?

This MR adds a check that the port used is 443, in addition to HTTPS being enabled, when activating the HSTS header.

### Why was this MR needed?

If a user is using a non-standard port for SSL, enabling this header would send clients to port 443 when that port is invalid.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9449

See merge request !966
 2015-07-13 08:09:51 +00:00
Stan Hu f4f216db67 Only enable HSTS header for HTTPS and port 443 
Closes https://github.com/gitlabhq/gitlabhq/issues/9449
 2015-07-12 21:37:10 -07:00
Douwe MaanandRobert Speicher b93053695a Fix transferring of project to another group using the API. 2015-07-11 16:47:33 -04:00
Stan Hu 96644c1fc1 Better handle unknown projects and groups for autocomplete 2015-07-11 06:19:32 -07:00
Stan Hu 0b67d7a0fe Fix user autocomplete for unauthenticated users accessing public projects 
Closes #1955
 2015-07-10 17:39:58 -07:00
Robert Speicher 800df45db2 Add disable_two_factor route for Admin::Users 2015-07-10 17:18:17 -04:00
Robert Speicher 22724418d3 Add User#disable_two_factor! 
This method encapsulates all the logic for disabling 2FA on a specific
User model.
 2015-07-10 16:18:30 -04:00