home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
18287 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
karen Carias 10e8fd46b1 fixed info in doc 2015-07-10 16:09:52 -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
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
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
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
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
Ben Boeckel 414cacd7f4 api: expose work_in_progress flag 2015-07-10 10:33:43 -04: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
Jacob Vosmaer 810ffab4b1 Use a loop when enabling subtasks 2015-07-10 14:44:07 +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 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
Dmitriy Zaporozhets d1261d88f1 Merge branch 'rs-update-coveralls' into 'master' 
Bump coveralls version, remove explicit rest-client dependency

coveralls got updated, so we don't need the rest-client entry in the Gemfile anymore.

See merge request !951
 2015-07-10 10:24:17 +00:00
Marin Jankovski e745b9e363 Merge branch 'rs-issue-1939' into 'master' 
Minor style fixes

### Reset ul list style types inside notes

Because notes are themselves `ul`s, lists inside of notes started at the wrong depth, so this resets that.

Closes #259

---

### Style all blockquote children, not just p

Makes styling of non-paragraph text, such as lists, inside blockquotes consistent.

Closes #1939

See merge request !949
 2015-07-10 10:15:41 +00:00
Stan Hu 13bf844a1e Revert "use relative link to SSH setup page" 
This reverts commit f876ef6e4d.
 2015-07-09 22:50:05 -07:00
Robert Speicher b50bfcc619 Bump coveralls version, remove explicit rest-client dependency 2015-07-09 18:35:40 -04:00
karen Carias ec72aaeae7 added new doc about creating a new branch 2015-07-09 15:33:42 -07:00
Dmitriy Zaporozhets 7b06c32e00 Point to ci.gitlab.com badge in README 2015-07-09 22:28:12 +00:00
Darby 360ee25ddb Fixed the issues 2015-07-09 13:38:33 -07:00
Stan Hu 3f5a4ae5e6 Merge branch 'revert-note-query-information' into 'master' 
Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries"

This reverts commit dd4fee5fdb.

See merge request !950
 2015-07-09 20:07:40 +00:00