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 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
Dmitriy Zaporozhets 5309dad459 Merge branch 'last-push-widget' into 'master' 
Last push widget

Continue of !938. Screenshots are at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/938#note_1594727

See merge request !946
 2015-07-09 11:25:05 +00:00
Jacob Vosmaer 4612599e5e Remove rake task re-enabling into a method 2015-07-09 12:11:35 +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 11e43cddbc Merge branch 'plain-readme' into 'master' 
Properly render plain readme

## Before

![Screenshot_2015-07-09_11.38.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba53ad380060eba368aed4ecc71ff4da/Screenshot_2015-07-09_11.38.16.png)

## After

![Screenshot_2015-07-09_11.37.38](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b154c5464c3f89d3ed7a0e7157ee6c58/Screenshot_2015-07-09_11.37.38.png)

cc @rspeicher

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

See merge request !945
 2015-07-09 09:54:31 +00: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 e49f1a274a Mention project page redesign in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 10:34:20 +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
Dmitriy Zaporozhets 27a9ff8264 Merge branch 'rs-dev-issue-2372' into 'master' 
Filter by issues/merge requests without a milestone

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372

See merge request !886
 2015-07-08 21:42:29 +00:00
Dmitriy Zaporozhets 512bb5ba28 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-08 23:30:37 +02:00
Dmitriy Zaporozhets c8e9246ef6 Merge branch 'project-home-page' into 'master' 
New project home page

## Why?

Because current project page is overloaded with information

## Changes

* move activity to separate tab
* make project show page cleaner by removing redundant information
* render README as main content of project page

cc @sytses @JobV

See merge request !938
 2015-07-08 21:29:59 +00:00
Dmitriy Zaporozhets f0e1da04f0 Show last push widget on several project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 23:21:35 +02:00
Sytse Sijbrandij 411d5287ed Link to update page. 2015-07-08 20:30:35 +00:00
Sytse Sijbrandij b2246ed175 Make sure webhooks are mentioned at the top level. 2015-07-08 22:27:36 +02:00
Stan HuandRobert Speicher 098ced4faa Improve features to ensure Ajax filter has actually executed 2015-07-08 15:57:24 -04:00
Robert Speicher 098ad0a5b4 Remove "mystery guest" from Milestone filtering features 2015-07-08 15:49:37 -04:00
Achilleas Pipinellis d991e3e41a Merge branch 'use_teaspoon' into 'master' 
use teaspoon instead of jasmine:ci

use teaspoon instead of jasmine:ci while launching local test

see 18ef9befc0

See merge request !941
 2015-07-08 19:01:59 +00:00
Dmitriy Zaporozhets a0b9fe1288 Fix project tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 20:22:42 +02:00
Jacob Vosmaer 64f6034091 More hacks to get the specs working again 2015-07-08 20:07:56 +02:00
Francesco Coda Zabetta 6d56bd8690 use teaspoon instead of jasmine for testing javascript 2015-07-08 17:46:51 +02:00
Dmitriy Zaporozhets e05fbf0494 Fix creating file in new repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 17:41:59 +02:00
Dmitriy Zaporozhets 0ebe8be02d Fix schortcut tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 17:36:31 +02:00
Dmitriy Zaporozhets 39a4bb2abd Cleanup and some test fixes after refactoring project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 16:55:04 +02:00
Dmitriy Zaporozhets bd08ac55c7 Recommend user to create README file for both empty and existing project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 13:41:03 +02:00
Dmitriy Zaporozhets 17156cf909 Imrpove mobile view for project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 13:34:05 +02:00
Dmitriy Zaporozhets 77fb7e078e Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:49:06 +02:00
Dmitriy Zaporozhets 8404ab46b9 Add shortcut for project activity page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:43:46 +02:00
Dmitriy Zaporozhets c2f02fc1a4 Refactor star and fork buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:25:34 +02:00
Job van der Voort ad12c1264d Merge branch 'add-ie-compat-notice' into 'master' 
Added info about common UI problems if IE Compatibility View mode is enabled.

/cc @sytses @Haydn

See merge request !939
 2015-07-08 09:32:23 +00:00