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
17,635 Commits 48 Branches 340 Tags
171d6fccae79efe4e85e772cb501b2e23e862b19
Commit Graph
17635 Commits
This Branch
This Branch
All Branches
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 ff3b68ac93 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-12 15:04:40 +02: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 ed97b057f6 Mention search improvements in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-12 14:37:34 +02: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 29cbb2f078 Update specs. 2015-07-11 16:47:33 -04:00
Douwe MaanandRobert Speicher b93053695a Fix transferring of project to another group using the API. 2015-07-11 16:47:33 -04:00
Hannes Rosenögger f94587eccb Merge branch 'improve-autocomplete-controller-for-unknowns' into 'master' 
Better handle unknown projects and groups for autocomplete

While working on !963, I noticed that specifying an unknown project ID or group ID would cause an error in the controller. This MR improves on the handling of unknown projects or groups:

1. If the user is authenticated, return a blank JSON with a 404 error.
2. Otherwise, redirect the user to login so we don't leak information about whether certain projects/groups exist.

See merge request !964
 2015-07-11 19:28:43 +00:00
Stan Hu dc6aa1d34a Merge branch 'fix-changelog-typos' into 'master' 
Fix typo and remove duplicate entry shipped in v7.12.2

See merge request !965
 2015-07-11 17:56:51 +00:00
Stan Hu e9df1cd363 Fix typo and remove duplicate entry shipped in v7.12.2 2015-07-11 10:20:47 -07: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
Dmitriy Zaporozhets ddaac5317f Merge branch 'fix-multiple-dropzone-icons' into 'master' 
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.

![gitlab-dropzone-icon-bug](https://gitlab.com/dgerhardt/gitlab-ce/uploads/23e558a375cece21cc7af410e3839e05/gitlab-dropzone-icon-bug.png)

Steps to reproduce:
1. Open an existing issue or merge request with comments.
2. Move a file over the new comment dropzone. One paperclip icon should appear.
3. Now click the edit button for an existing comment and repeat step 2. You should see two paperclips.

Fixes #1725.

See merge request !959
 2015-07-10 23:04:48 +00: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
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
Sytse Sijbrandij b5e2dd6f32 Merge branch 'fig-info' into 'master' 
information about why we use fig.yml

Because of tweet https://twitter.com/nicholasruunu/status/619533541605539841

cc/ @sytses @ayufan

See merge request !960
 2015-07-10 20:16:55 +00:00
Sytse Sijbrandij 98c3f44689 Merge branch 'link-multiple-issues' into 'master' 
Added link to issue closing pattern documentation in milestones doc

Added link from Milestones doc to Issue closing pattern because I think they can be useful. Because of Tweet https://twitter.com/steenwijkict/status/619210265008205824

cc/ @sytse 

See merge request !1895
 2015-07-10 20:13:00 +00:00
karen Carias 903daedb5a added link to issue closing pattern in doc 2015-07-10 12:54:02 -07:00
karen Carias f110bb2db2 information about why we use fig.yml 2015-07-10 12:33:31 -07: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
Sytse Sijbrandij 526813581b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 
Conflicts:
	docker/marathon.json
 2015-07-10 18:44:54 +02:00
Sytse Sijbrandij a69855fc90 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-07-10 18:43:39 +02:00
Sytse Sijbrandij 1ea0db475f Add volumes to marathon file. 2015-07-10 18:43:32 +02:00
Sytse Sijbrandij aa33189c09 Update image to latest one 2015-07-10 16:32:09 +00: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 77025ad8e3 Merge branch 'compact-sidebar' into 'master' 
Smaller font and leing height for sidebar elements

Recently we added few more entries to project sidebar navigation making it overflow on laptops

1280x720 resolution now:

![Screenshot_2015-07-10_15.34.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/19f5c77e5d19cf935a4323a079020f7b/Screenshot_2015-07-10_15.34.52.png)

After this fix:

![Screenshot_2015-07-10_15.34.35](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ca9cdcc2ce9c9b6aabb823ba64a3a30a/Screenshot_2015-07-10_15.34.35.png)

This should help for people who use scaling with retina or owners of MacBook Air laptops

cc @JobV

See merge request !955
 2015-07-10 14:11:40 +00: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 e370ec7c6e Merge branch 'labels-small-buttons' into 'master' 
Make edit/remove label buttons smaller

## Before

![Screenshot_2015-07-10_14.29.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/bc7a4886997ab194c1213f38f163b269/Screenshot_2015-07-10_14.29.46.png)

## After

![Screenshot_2015-07-10_14.31.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ebb386a38e264ca7b50dc08891cb919c/Screenshot_2015-07-10_14.31.09.png)

See merge request !954
 2015-07-10 12:56:49 +00: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 82a3f2f109 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-07-10 13:13:13 +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
Sytse Sijbrandij 14b7a8b886 Revert "Remove intro and link to Dockerhub" 
This reverts commit 57ec283287.
 2015-07-10 12:59:25 +02:00
Sytse Sijbrandij 781b4768fb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-10 12:59:07 +02:00
Sytse Sijbrandij 57ec283287 Remove intro and link to Dockerhub 2015-07-10 10:57:39 +00:00
Sytse Sijbrandij 198d5c6e06 Remove intro and link to Dockerhub 2015-07-10 10:56:39 +00:00
Dmitriy Zaporozhets 34441138b6 Merge branch 'readme-ci-com-badge' into 'master' 
Point to ci.gitlab.com badge in README



See merge request !1893
 2015-07-10 10:28:27 +00:00