home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +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
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
Stan Hu 4c586dc7c2 Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries" 
This reverts commit dd4fee5fdb.
 2015-07-09 12:35:53 -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
Stan Hu add283bf68 Merge branch 'note-query-information' into 'master' 
Note query information

The 'editable' field is required to be able to distinguish system-created notes from user comments. The 'upvote' and 'downvote' fields are so that endpoints don't need to duplicate GitLab's logic for what an up or downvote is.

See merge request !677
 2015-07-09 15:29:14 +00:00
Ben Boeckel dd4fee5fdb api: add 'system', 'upvote', and 'downvote' fields to note queries 2015-07-09 11:24:28 -04:00
Kamil Trzciński 36f3e2062d Merge branch 'docker-single' into 'master' 
Update docker documentation to use only one docker container

I updated documentation to use only one docker container with manually specified path to the persistent data. The container is named `gitlab` and the image will be put in GitLab organisation: https://registry.hub.docker.com/u/gitlab/gitlab-ce/

- [x] Add VOLUMEs to Dockerfile
- [x] Removed all other Dockerfiles (moved everything from docker/single/ to docker/)
- [x] Create DockerHub repository for GitLab CE
- [x] Reword README to use single image
- [x] Push images (manually) to the repository
- [ ] Push to GitHub
- [ ] Enable Automated Build
- [ ] Integrate tagging and pushing of the image with GitLab CI

@JobV @sytses Please review.

See merge request !909
 2015-07-09 14:10:58 +00: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 0d83ca4ff8 Merge branch 'cache-readme' into 'master' 
Cache readme rendering result

Markdown rendering is expensive. Lets cahce result

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

See merge request !947
 2015-07-09 13:13:03 +00: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 d8dfbc5118 Improve readme tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 14:31:03 +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 846538076b Dont check for link but for actual readme content 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 13:27:50 +02:00