home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,773 Commits 48 Branches 340 Tags
v7.13.5
Commit Graph
8716 Commits
Author SHA1 Message Date
Dmitriy ZaporozhetsandValery Sizov d4bf7848cb Revert "Merge branch 'web-editor-rugged' into 'master'" 
This reverts commit 5a1aa49b55, reversing
changes made to a675bea2c1.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:53:01 +03:00
Dmitriy ZaporozhetsandValery Sizov b1958385cd Revert "Create and edit files in web editor via rugged" 
This reverts commit 734a4ba87d.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:51:48 +03:00
Dmitriy ZaporozhetsandValery Sizov aeec708f53 Revert "Fix adding new file to empty repo" 
This reverts commit 27a158506e.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:51:07 +03:00
Dmitriy ZaporozhetsandValery Sizov 3ffd63888d Revert "Use rugged in web editor for base64 encoding" 
This reverts commit 541133197b.
 2015-08-12 13:50:28 +03:00
Dmitriy ZaporozhetsandValery Sizov f22f7a6f51 Revert "Create activity event and execute hooks on web editor commit" 
This reverts commit 3d416f1682.
 2015-08-12 13:50:20 +03:00
Dmitriy ZaporozhetsandValery Sizov fac581b170 Revert "Make web editor work correctly after switch from satellites" 
This reverts commit 435f680b89.
 2015-08-12 13:50:11 +03:00
Dmitriy ZaporozhetsandValery Sizov 60b3d2b704 Revert "Refactor web editor" 
This reverts commit dfccb06dda.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:49:51 +03:00
Dmitriy ZaporozhetsandValery Sizov 52d10d73ea Fix conflict issue 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:48:56 +03:00
Dmitriy ZaporozhetsandValery Sizov 2258572b80 Revert "Merge branches inside one repository using rugged instead of satellites" 
This reverts commit d24c40ec21.
 2015-08-12 13:48:47 +03:00
Dmitriy ZaporozhetsandValery Sizov 9a1ad8deec Revert "Merge branch 'refactor-can-be-merge' into 'master'" 
This reverts commit 459e6d3467, reversing
changes made to 804168e1de.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:48:16 +03:00
Dmitriy ZaporozhetsandValery Sizov 92a0c329f6 Improve wording in abuse report form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:26 +03:00
Dmitriy ZaporozhetsandValery Sizov 8b7a269008 Remove selectbox from abuse form. Added pagination in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:19 +03:00
Dmitriy ZaporozhetsandValery Sizov 3dc13281ee Add abuse report management in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:11 +03:00
Dmitriy ZaporozhetsandValery Sizov 0a9c65c9a0 Allow users to send abuse reports 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:03 +03:00
Douwe MaanandValery Sizov c84350ab68 Fix bug causing Bitbucket importer to crash when OAuth application had been removed. 2015-08-04 13:19:58 +03:00
Robert SpeicherandValery Sizov abefd20fa1 Render Note field hints consistently for "new" and "edit" forms 
- The "Edit" form didn't have Markdown hints.
- The "New" form had a paperclip icon for attachments, the "edit" form
  didn't.

Closes #2010

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
 2015-07-28 14:42:14 +03:00
Marin JankovskiandValery Sizov 6e5209baca Use mdash to prevent breaking html emails. 2015-07-28 14:41:43 +03:00
Robert SpeicherandValery Sizov bf0a5cf358 Show the first tab automatically on MergeRequests#new 
Closes #2013
 2015-07-28 14:40:45 +03:00
Robert SpeicherandValery Sizov 42c362313e Dynamically check :admin_* ability in IssuableBaseService 
Closes #2092
 2015-07-28 14:39:54 +03:00
Robert SpeicherandValery Sizov 81c861cf11 Dynamically check :admin_* ability on issuable form 
Closes #2092
 2015-07-28 14:39:45 +03:00
Robert SpeicherandValery Sizov 9079f4dd72 Add Issuable#to_ability_name 2015-07-28 14:39:38 +03:00
Stan HuandValery Sizov 1dac44bf85 Fix Error 500 when browsing projects with no HEAD 
Steps to reproduce:
1. Create a project with a README
2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere`
3. Check that HEAD is gone via `git ls-remote .`
4. Go to the projects page and see the Error 500

Closes https://github.com/gitlabhq/gitlabhq/issues/9484
 2015-07-28 14:39:15 +03:00
Robert SpeicherandValery Sizov 997c991ae6 Add admin_merge_request ability to Developer level and up 
This was necessary because this permission is checked dynamically by
`app/views/shared/issuable/_context` when on a Merge Request.

Closes #2058
 2015-07-28 14:38:34 +03:00
Robert SpeicherandValery Sizov 064a0774b7 Create project services on Project creation 2015-07-28 14:37:59 +03:00
Douwe MaanandValery Sizov 529091b6a3 Return true/false from AutoMergeService#merge! 2015-07-23 14:26:34 +03:00
Douwe MaanandValery Sizov 81666b301a Fix Remove source-branch for MRs from same project 2015-07-23 14:26:24 +03:00
Valery Sizov 8d1ccf7e3a revert cache for events 2015-07-23 11:19:17 +03:00
Achilleas PipinellisandValery Sizov b50f5f9051 Fix link to 2fa help page. Closes #2055 2015-07-23 11:09:00 +03:00
Hannes RosenöggerandValery Sizov b132127f5c revert caching of note text 2015-07-23 11:05:32 +03:00
Valery Sizov 29861f24a6 revert cache issue 2015-07-23 11:02:17 +03:00
Valery Sizov e8a6495b66 Revert "Update noteable after a new note is added" 
This reverts commit fbdaf0e2a5.
 2015-07-21 13:30:47 +03:00
Valery Sizov c6dea4f4c0 Public project activity page asks for sign-in 2015-07-21 13:17:44 +03:00
Stan HuandValery Sizov e2b1adf628 Remove redundant last push event if activity feed is set to main page 
Closes #2009
 2015-07-21 13:16:44 +03:00
Robert SpeicherandValery Sizov 44f658012d Dynamically check :admin_* ability in issuable context 
Closes #2001
 2015-07-21 13:15:38 +03:00
Stan HuandValery Sizov 77363724b2 Remove repository graph log to fix slow cache updates after push event 
Recalculating graph_log took minutes on a large repository since each
of the 6000 commits would need to calculate the diff. Since graph_log
does not appear to be used, remove it from the list of things to update.
For the Linux kernel repository, this reduced the ProjectCacheWorker time
from 8+ minutes to 16 seconds.

Closes #2016
 2015-07-21 13:12:01 +03:00
Valery Sizov 008d1381ce Revert "Revert "Merge branch 'cache-improvement' into '7-13-stable' 
This reverts commit ebb6393d0e.
 2015-07-21 13:07:39 +03:00
Valery Sizov ebb6393d0e Revert "Merge branch 'cache-improvement' into '7-13-stable' " 
This reverts commit 94c2516afc, reversing
changes made to ae44e5ec06.
 2015-07-19 22:49:21 +03:00
Stan HuandValery Sizov 55b4f31d92 Fix bug where notes were being rendered with wrong color preferences due to caching 
Closes #2008
 2015-07-19 22:37:11 +03:00
Stan HuandValery Sizov ed5dcec5de Fix bug where clicking on the link icon on a file would result in "L#undefined" in the URL 
Closes #2002
 2015-07-19 22:36:14 +03:00
Dmitriy Zaporozhets 2fa3acaa43 Merge branch 'advanced-cache' into 'master' 
Advanced cache

Fixes #1993

* Build missing cache values in background job after each push
* Store commit_count in project table. Refresh in background job
* moved repository size calculation in background job


## Advantages

Every time push is triggered - we build cache for project even without user visiting project page. 
That means first visit is as fast as others now. This is especially good for active projects where people have some requests fast because of cache and some slow - because cache was build in their request. 

Between cache expired and cache built we we had gap when Linux repo can give 502 error because calculation commits count takes 30 seconds or even more. 
Using value from database fix this problem. Before cache is updated you see old value from database. After - you see new one. 

Basically this merge request is super win to GitLab. We don't do some heavy operations in user request but instead in background job. 

## Temporary problem

After this migration all projects will have `0` commits in database. It fill be replaced with real value on next push. I did not add recalculation to migration because it will last forever on big instances.  Can be fixed by adding rake task which will go in background on live instance without downtime

See merge request !986
 2015-07-17 17:22:13 +02:00
Valery Sizov 5b0d813c09 Time ago fix for compare page 2015-07-15 17:40:59 +03:00
Dmitriy Zaporozhets 2280cb23d4 Merge branch 'nice-scroll-sidebar' into 'master' 
Add nice scroll for sidebar

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

See merge request !978
 2015-07-14 10:48:21 +00:00
Dmitriy Zaporozhets 98cb6256fa Add nice scroll for sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-14 12:29:57 +02:00
Kamil Trzcinski 2def2cc60a Hide scrollbar from sidebar when external mouse is connected to OSX 2015-07-14 12:02:42 +02:00
Dmitriy Zaporozhets 90e47dd949 Merge branch 'rs-issue-1773' into 'master' 
Fix mentions not being created upon issue/merge request update

New cross-references weren't being added when they were made in an issue or merge request update.

This happened because the relevant `UpdateService`s were making the `notice_added_references` call
after the model had already been updated and saved, so the `changes` attribute was empty and no
cross-references were made at all.

This fixes the bug and adds a bit of testing and a bit of refactoring.

Closes #1773

See merge request !974
 2015-07-14 08:40:08 +00:00
Dmitriy Zaporozhets 5c53dc5a1e Merge branch 'project-default-view' into 'master' 
Allow user to specify content he wants to see on project page

Improvement to !938. Since a lot of people complain on fact they don't like to see README.
Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour.

User can specify which content he/she wants to see:

![Screenshot_2015-07-13_18.24.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d237474e8f52df4a62ba7e951fa28bd8/Screenshot_2015-07-13_18.24.31.png)

![Screenshot_2015-07-13_18.24.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/473b0e2a94b3de16d048b8332b539816/Screenshot_2015-07-13_18.24.36.png)

cc @JobV @jacobvosmaer @marin @sytses

See merge request !970
 2015-07-14 08:30:46 +00:00
Robert Speicher f3d4767d0c Rename notice_added_references to create_new_cross_references! 2015-07-13 21:31:16 -04:00
Robert Speicher e4c698fd5c Refactor Mentionable#notice_added_references 
It now accounts for models that have changed but have already been
persisted, such as when called from an UpdateService.

Closes #1773
 2015-07-13 21:31:00 -04:00
Dmitriy Zaporozhets fd84567545 Improve project new item dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 23:36:21 +02:00
Dmitriy Zaporozhets 59d7f4c97f Merge branch 'use_password_field_defaults_for_services' into 'master' 
Use password field defaults for services

Previously we masked the password field manually. After the refactor that services page received we can use `password_field` default masking.

Fixes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/314

See merge request !969
 2015-07-13 18:10:08 +00:00