home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +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 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
Dmitriy Zaporozhets d3d1e9ef65 Merge branch 'search-git-grep' into 'master' 
Implement faster search of code (via git grep)

Much faster than iterating over each file using rugged.

Performance compare for Linux repository using keyword `sha`:

```
OLD: 250 seconds
NEW: 9 seconds
```

See merge request !957
 2015-07-12 13:03:12 +00:00
Dmitriy Zaporozhets ec19a960ca Add tests for repository search files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-12 14:32:25 +02:00
Dmitriy Zaporozhets 9ab12e099d Fix search blobs for wiki 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-12 14:01:06 +02:00
Douwe MaanandRobert Speicher b93053695a Fix transferring of project to another group using the API. 2015-07-11 16:47:33 -04:00
Nikita Verkhovin 562d78a65a Add error message for SSH key linebreaks 2015-07-12 00:18:56 +06:00
Stan Hu 96644c1fc1 Better handle unknown projects and groups for autocomplete 2015-07-11 06:19:32 -07:00
Hannes Rosenögger d0b240136a Merge branch 'fix-autocomplete-with-public-projects' into 'master' 
Fix user autocomplete for unauthenticated users accessing public projects

Closes #1955

See merge request !963
 2015-07-11 12:54:09 +00: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 db8f4c0606 Add a button to Admin::Users#show to disable 2FA for that user 2015-07-10 17:18:33 -04:00
Robert Speicher 800df45db2 Add disable_two_factor route for Admin::Users 2015-07-10 17:18:17 -04:00
Darby 4e4ab4893d Changed to using the btn class 2015-07-10 13:41:52 -07: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
Robert Speicher 5431368ad1 Update msapplication-TileColor value 2015-07-10 14:04:56 -04:00
Robert Speicher 353dc1e83e Update background color for touch-icon-* images 2015-07-10 14:03:56 -04:00
Daniel Gerhardt 1ea2dfa5de Do not add the same icon multiple times to dropzones 
Some DOM queries were to broad which caused paperclip icons and spinners
to be added multiple times to a dropzone in case of multiple dropzones
on a page.
 2015-07-10 19:46:40 +02:00
Stan Hu ea5e5ee4dc Merge branch 'fix-migrating-from-svn-doc-link' into 'master' 
Fix migrating from SVN document link

Closes #1959

See merge request !958
 2015-07-10 16:23:18 +00:00
Stan Hu 18f6cf33ef Fix migrating from SVN document link 
Closes #1959
 2015-07-10 09:20:24 -07:00
Dmitriy Zaporozhets f6609c9882 Implement search of code via git grep 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 17:50:50 +02:00
Dmitriy Zaporozhets 8902253e0d Smaller font and leing height for sidebar elements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 15:33:10 +02:00
Dmitriy Zaporozhets 37cdffd98b Make edit/remove label buttons smaller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 14:27:12 +02:00
Dmitriy Zaporozhets bda04bc687 Merge branch 'fork_visibility_level' into 'master' 
Forks should not have more permissive visibility levels than the original

https://dev.gitlab.org/gitlab/gitlabhq/issues/2286

See merge request !936
 2015-07-10 12:05:54 +00:00
Dmitriy Zaporozhets 7574ec4b85 Merge branch 'hierarchical-navigation' 2015-07-10 13:59:52 +02:00
Dmitriy Zaporozhets 3e97051bce Fix missing avatar in event feed when created project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 13:33:08 +02:00
Dmitriy Zaporozhets e4a1d29077 Better name for group tab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 13:29:46 +02:00
Dmitriy Zaporozhets 4dfded8934 Make left menu more hierarchical and less contextual by adding back item at top 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 13:29:46 +02:00
Dmitriy Zaporozhets fdbaffdc08 Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ce 2015-07-10 13:13:02 +02:00
Darby 360ee25ddb Fixed the issues 2015-07-09 13:38:33 -07:00
Robert Speicher 4498de4867 Reset ul list style types inside notes 
Closes #259
 2015-07-09 15:10:59 -04:00
Robert Speicher df64e0db08 Style all blockquote children, not just p 
Closes #1939
 2015-07-09 14:50:09 -04:00
Dmitriy Zaporozhets 6e0c596a1c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-09 15:15:45 +02:00
Dmitriy Zaporozhets 901614267d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-07-09 15:13:30 +02:00
Dmitriy Zaporozhets 51ceae6724 Merge branch 'edit-readme' into 'master' 
Show edit readme from project home page

I added pencil icon which redirect you to edit README page (web editor). In this case people can make changes to README easily without going to Files tab, searching for README and pressing edit button here

cc @job  @darby 

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

See merge request !1892
 2015-07-09 13:00:17 +00:00
Dmitriy Zaporozhets 635ffe4841 Cache readme rendering result 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 14:47:28 +02:00
Dmitriy Zaporozhets a4bf548a54 Merge pull request #9438 from bbodenmiller/patch-3 
dont -> don't
 2015-07-09 13:45:08 +02:00
Dmitriy Zaporozhets e9ab09c6b5 Merge branch 'project-home-page' 2015-07-09 12:10:40 +02:00
Dmitriy Zaporozhets 6848b0a625 Show edit readme from project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 12:08:00 +02:00
Dmitriy Zaporozhets 1bf3e1578a Properly render plain readme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 11:36:09 +02:00
Dmitriy Zaporozhets 3cdd68475f Add star icon to star button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 11:00:14 +02:00
Dmitriy Zaporozhets b6821ff4ea Merge branch 'rs-remove-task-states' into 'master' 
Remove unused `task_[un]check` states from Update services

These were left over from the old Task handling.

See merge request !942
 2015-07-09 08:30:19 +00:00
Dmitriy Zaporozhets 43e410ad04 Merge branch 'rs-issue-1750' into 'master' 
Ensure `@sort` is set by set_filters_params

Closes #1750

See merge request !943
 2015-07-09 08:29:30 +00:00
Robert Speicher c4330d97b1 Add Windows 8 pinned site tile meta tags 2015-07-09 01:43:48 -04:00
Robert Speicher 6591485562 Add Safari/iOS versions of the logo 2015-07-09 01:43:46 -04:00
Robert Speicher 335749d754 Ensure @sort is set by set_filters_params 
Closes #1750
 2015-07-08 18:17:13 -04:00
Robert Speicher 8a148793af Simplify Issue and MergeRequest UpdateServices 
Now that those pesky task states are gone, these become a lot simpler.
 2015-07-08 18:00:42 -04:00
Robert Speicher 0e5fbb29f4 Remove unused task_[un]check states from Update services 
These were left over from the old Task handling.
 2015-07-08 17:56:56 -04:00