home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,202 Commits 48 Branches 340 Tags
befff32ecba3cd5fa634ea90ce2fc365a1b5e34e
Commit Graph
3020 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 038c9a65fb Merge branch 'ui/dashboard-new-issue' into 'master' 
UI: Add "New X" buttons to dashboard and group issue, MR and milestone indexes

# To do

- [x] Use searchable dropdown since dashboard/group can have a lot of projects. Use select2?

## Before

![Screen_Shot_2015-12-07_at_17.26.52](/uploads/22c6d6df10414f9e3e35d6cea3870486/Screen_Shot_2015-12-07_at_17.26.52.png)

## After

![Screen_Shot_2015-12-07_at_17.26.33](/uploads/02d082490ed6c83c66f052a5b601b5be/Screen_Shot_2015-12-07_at_17.26.33.png)

As you can see, for milestones, groups are listed as well as we can now easily create group milestones.

Fixes #3544 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2581

See merge request !1968
 2015-12-08 16:43:20 +00:00
Douwe Maan 033947de90 Merge branch 'sync-all-repos' into 'master' 
Sync all repos

Scripts and documentation for moving repos, used on gitlab.com.

See merge request !1439
 2015-12-08 16:13:59 +00:00
Jacob Vosmaer a80f0f66e3 Merge branch 'rake-tasks-git' into 'master' 
Added 3  rake tasks for repository maintainance

## What does this MR do?
This MR adds 3 rake tasks

- gitlab:git:repack
  - `-a`
  - `--quiet`
- gitlab:git:gc
  - `--auto`
  - `--quiet`
- gitlab:git:prune
  - Needs git version > 1.8.4.1, Ubuntu repos @ 1.9.x

## Are there points in the code the reviewer needs to double check?
AFAIK this MR abides by the Guidelines for shell commands. Also, the output given is not the diskspace saved etc, just if the commands were succesfull. (Parsing output etc did not seem like the way to go)

Output might be verbose when a lot of repo's are in the system?

## Why was this MR needed?
`git gc` and `git prune` can reduce storage space used.

## What are the relevant issue numbers / Feature requests?
Closes #1529

## Screenshots (if relevant)
`rake -T`
![Screenshot_from_2015-09-22_14-57-59](https://gitlab.com/zj/gitlab-ce/uploads/4abfa00ce7afcc73f553d92581246731/Screenshot_from_2015-09-22_14-57-59.png)
(git fsck now removed as IMHO it doesn't add any value.)

See merge request !1388
 2015-12-08 16:05:49 +00:00
Robert Speicher 4cd259e91d Merge branch 'fix-omniauth-signin' into 'master' 
Fix signin with OmniAuth providers

OmniAuth CSRF protection was broken with the move to Rails 4.2 since
the CSRF logic in Rails changed. 

This new implementation calls out to Rails instead of copying its code,
which is far easier to maintain.

See merge request !2019
 2015-12-08 15:32:24 +00:00
Jacob Vosmaer 23f383ef69 Detect project and namespace changes in list:repos 2015-12-08 16:06:06 +01:00
Douwe Maan 15925290ee Merge branch 'master' into ui/dashboard-new-issue 2015-12-08 15:22:04 +01:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master' 
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
 2015-12-08 14:19:52 +00:00
Douwe Maan 41a4785b85 Fix signin with OmniAuth providers 2015-12-08 14:58:15 +01:00
Jacob Vosmaer 6d2be0212c Merge branch 'master' into sync-all-repos 2015-12-08 12:35:54 +01:00
Robert Speicher 2379c8beea Inline Gitlab::Blacklist in NamespaceValidator 2015-12-07 16:57:26 -05:00
Robert Speicher b3200c8c44 Move EmailValidator to app/validators 2015-12-07 16:57:26 -05:00
Dmitriy Zaporozhets 168b3e973f Merge branch 'fix-api-private-project-update' into 'master' 
Fix API setting of 'public' attribute to false will make a project private

There is a bug in the projects API where setting `public` to `false` of  would not change `visibility_level` even if `visiblity_level` were not present.

Closes #3864

See merge request !1996
 2015-12-07 18:56:40 +00:00
Douwe Maan 5a9a8d03a7 Merge branch 'master' into ui/dashboard-new-issue 2015-12-07 17:12:29 +01:00
Douwe Maan 8f817c7b08 Add API group projects endpoint. 2015-12-07 17:10:40 +01:00
Valery Sizov bd5fb1b479 Merge branch 'webhook_payload_with_changes' into 'master' 
Add added, modified and removed properties to commit object in webhook

https://gitlab.com/gitlab-org/gitlab-ee/issues/20

See merge request !1988
 2015-12-07 14:43:13 +00:00
Valery Sizov 3c97cbc74c fixes after review 2015-12-07 15:13:06 +02:00
Jacob Vosmaer b899436248 Merge pull request #9892 from stetskevych/fix_nginx_ssl_config 
Fix gitlab-ssl nginx config to work when multiple server_names are served over https
 2015-12-07 14:03:33 +01:00
Valery Sizov 5df2c4419c fox specs 2015-12-07 14:14:35 +02:00
Zeger-Jan van de Weg 3da32ef7d8 Merge branch 'master' into rake-tasks-git 2015-12-07 12:06:20 +01:00
Stan Hu 234f4bf20f Merge branch 'fix-gitlab-workhorse-initd-check' into 'master' 
Check GitLab Workhorse status in init.d script when reporting all components are up and running

Closes https://github.com/gitlabhq/gitlabhq/issues/9869

See merge request !1969
 2015-12-06 17:36:35 +00:00
Stan Hu 631a30276e Fix API setting of 'public' attribute to false will make a project private 
Closes #3864
 2015-12-05 17:39:36 -08:00
Vyacheslav Stetskevych 1c4213acd5 Fix gitlab-ssl nginx config to work when multiple server_names are served over https 2015-12-06 03:10:29 +02:00
Robert Speicher d2f9a9012d Merge branch 'link-refs' into 'master' 
Recognize issue/MR/snippet/commit links as references.

Fixes #3744 and #3745

See merge request !1933
 2015-12-04 20:58:45 +00:00
Stan Hu f1fd4880d9 Check GitLab Workhorse status in init.d script when reporting all components are up and running 
Closes https://github.com/gitlabhq/gitlabhq/issues/9869
 2015-12-04 07:12:49 -08:00
Valery Sizov 5c1b49f494 Add added, modified and removed properties to commit object in webhook 2015-12-04 16:23:21 +02:00
Dmitriy Zaporozhets 4de7f32c60 Merge branch 'extend-events-api' 2015-12-04 13:51:30 +01:00
Marin Jankovski b2c4675cb0 Recursivity needed if a fork is a fork of a fork. 2015-12-04 12:32:13 +01:00
Dmitriy Zaporozhets 3227a5ead2 Extent Event and Note API 
* add note to Events API
* add author section to Events API
* add noteable_id and noteable_type to Notes API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 12:22:50 +01:00
Dmitriy Zaporozhets 0b68a0e79e Add API endpoint to fetch merge request commits list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 11:08:10 +01:00
Douwe Maan f9d954fae7 Satisfy rubocop 2015-12-03 19:02:56 +01:00
Douwe Maan 0de8e26066 Pass original text along with label reference filter. 2015-12-03 14:00:41 +01:00
Douwe Maan f905fd239c Use URL helpers in specs 2015-12-03 14:00:09 +01:00
Douwe Maan 928d131e39 Merge branch 'master' into link-refs 2015-12-03 13:32:42 +01:00
Valery Sizov 162cd0099c fix deprecation messages in tests 2015-12-03 10:33:43 +02:00
Douwe Maan 044e0e33dc Allow invalid URLs in closing pattern 2015-12-02 18:48:39 +01:00
Douwe Maan 60828ab40e Merge branch 'master' into link-refs 2015-12-02 12:12:03 +01:00
Douwe Maan 2f5074dc39 Expand inline docs. 2015-12-01 17:14:42 +01:00
Douwe Maan d4030a845e Pick up direct links to issues/MRs as references. 2015-12-01 16:53:07 +01:00
Douwe Maan 1d6d757dbd Allow reference format as link href 2015-12-01 16:25:56 +01:00
Douwe Maan f3ea06eb7f Autolink first so we don't pick up numeric anchors as issue references. 2015-12-01 15:53:32 +01:00
Douwe Maan 62c14ba2ed Render commit reference using short sha, but include full sha in comment. 2015-12-01 12:58:45 +01:00
Douwe Maan bd4ab21c07 Fix code docs 2015-12-01 12:49:22 +01:00
Douwe Maan f9017a2b03 Have ClosingIssueExtractor recognize all referenced issues 2015-11-30 21:36:35 +01:00
Douwe Maan d6a5b45c8e Recognize issue/MR/snippet/commit links as references. 2015-11-30 21:36:34 +01:00
Valery Sizov 13c6096e42 Merge branch 'upload_hook' into 'master' 
Fire update hook from GitLab

https://gitlab.com/gitlab-org/gitlab-ce/issues/3069

See merge request !1882
 2015-11-30 17:22:00 +00:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master' 
Rails update to 4.2.4

https://gitlab.com/gitlab-org/gitlab-ce/issues/2694

See merge request !1902
 2015-11-30 16:49:09 +00:00
Valery SizovandValery Sizov ae18ba1632 Fire update hook from GitLab 2015-11-30 18:36:34 +02:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Robert Speicher f1710073b4 Fix alignment 
[ci skip]
 2015-11-27 14:39:55 -05:00
Jacob Vosmaer 04049b6b17 Fix indentation in NGINX config 2015-11-27 13:57:53 +01:00