Commit Graph
17707 Commits
Author SHA1 Message Date
Valery Sizov f474f5d48f Merge branch 'ce_stabe_updates' into '7-13-stable'
Updates for 7.13 stable (RC4)



See merge request !1012
2015-07-21 11:01:13 +00: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
Jacob VosmaerandValery Sizov ab94ed089a Don't stop if database.sql.gz already exists
The existing behavior of the backups is to overwrite whatever data
was still there in the scratch directories. This broke when we added
a 'gzip' step because 'gzip database.sql' will fail if 'database.sql.gz'
already exists. Doing 'rm -f database.sql.gz' before the 'gzip'
avoids this failure.
2015-07-21 13:22:40 +03:00
Dmitriy ZaporozhetsandValery Sizov 6f3c99e4d5 Document should start from h1 title. Also put badges on top for easier tracking 2015-07-21 13:19:09 +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
Valery Sizov 3387c4bde8 update changelog 2015-07-21 13:13:04 +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 37037b70b8 Version 7.13.0.rc3 v7.13.0.rc3 2015-07-20 00:31:14 +03:00
Valery Sizov d0fb82c193 Merge branch 'update_for_stable' into '7-13-stable'
Fixes from master to 7.13.rc3



See merge request !1001
2015-07-19 20:11:03 +00: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 94c2516afc Merge branch 'cache-improvement' into '7-13-stable'
Merge branch 'advanced-cache' into 'master'

Backport to stable from merge request !986

- - -

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 !989
2015-07-17 16:19:50 +00: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 ae44e5ec06 Version 7.13.0.rc2 v7.13.0.rc2 2015-07-15 20:13:47 +03:00
Valery Sizov 6cc81e5f82 Merge branch 'update_stable' into '7-13-stable'
Time ago fix for compare page



See merge request !1905
2015-07-15 14:42:51 +00:00
Valery Sizov 5b0d813c09 Time ago fix for compare page 2015-07-15 17:40:59 +03:00
Valery Sizov 159cd36c10 Merge branch '7-13-stable_changelog' into '7-13-stable'
7-13 stable: changelog update



See merge request !1901
2015-07-15 09:16:19 +00:00
Valery Sizov 5533a87d56 changelog update 2015-07-15 12:15:32 +03:00
Sytse SijbrandijandValery Sizov fe01cc2fe5 Revert password change changelog entry. 2015-07-15 11:54:24 +03:00
Sytse SijbrandijandValery Sizov f8547fb90f Revert "Change default admin password from "5iveL!fe" to "password""
This reverts commit 8a01a12228.
2015-07-15 11:54:13 +03:00
Valery Sizov b6646e5ba9 Version 7.13.0.rc1 v7.13.0.rc1 2015-07-14 19:00:14 +03:00
Job van der Voort 1da6d42bca Merge branch 'notifications-title' into 'master'
fixed notifications title

I fixed the title and link to this document because I believe that it's more clear and easier to find if it has "emails" in the name.


See merge request !1897
2015-07-14 15:24:34 +00:00
Dmitriy Zaporozhets 070d6a2452 Merge branch 'fix-ed' into 'master'
Fix path to move_drop_indexes.ed

Small documentation fix.

See merge request !1900
2015-07-14 12:08:26 +00:00
Dmitriy Zaporozhets 67ad6cc7b4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-14 12:56:48 +02: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 77216386be Merge branch 'scrollbar-issue' into 'master'
Hide scrollbar from sidebar when external mouse is connected to OSX

See merge request !977
2015-07-14 10:47:29 +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
Valery Sizov bf3c970be9 Merge branch 'update-guide-713' into 'master'
create update guides for 7.13



See merge request !1899
2015-07-14 10:12:54 +00:00
Kamil Trzcinski 2def2cc60a Hide scrollbar from sidebar when external mouse is connected to OSX 2015-07-14 12:02:42 +02:00
Jacob Vosmaer e26e46db2c Fix path to move_drop_indexes.ed 2015-07-14 11:50:01 +02:00
Job van der Voort 80afd4c594 create update guides for 7.13 2015-07-14 11:49:53 +02:00
Dmitriy Zaporozhets c013a9de14 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-14 11:07:07 +02:00
Dmitriy Zaporozhets 87e6786aa0 Merge branch 'rs-fix-coverage' into 'master'
Move coverage-related setup back to spec_helper

These tools must be loaded before our regular Rails environment.

Partially reverts 57830201a9

See merge request !976
2015-07-14 09:03:03 +00:00
Dmitriy Zaporozhets 6114aedfe5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-14 10:52:46 +02:00
Dmitriy Zaporozhets ee53ba9f34 Merge branch 'mysql-to-postgres-ed' into 'master'
Add 'ed' step to mysql-to-postgres procedure

This change brings the documentation in this repo up to date with that in https://github.com/gitlabhq/mysql-postgresql-converter .

See merge request !1896
2015-07-14 08:52:01 +00: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 ce02bf9900 Move coverage-related setup back to spec_helper
These tools must be loaded before our regular Rails environment.
2015-07-13 22:41:47 -04: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 352362adaf Merge branch 'project-plus-icon' into 'master'
Replaced icon for project page dropdown button

Improve for !971

![Screenshot_2015-07-13_23.37.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2b168c6f8a07f33cab4ca8f735646f8a/Screenshot_2015-07-13_23.37.01.png)

See merge request !973
2015-07-13 21:53:37 +00: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
Dmitriy Zaporozhets 13e987a6de Merge branch 'project-dropdown' into 'master'
Add dropdown to quickly create issue or branch from project page

because just 'new issue' link is not valid for all users. A lot of people use external issue tracker. So I grouped several links under one button

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

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

cc @JobV @marin @jacobvosmaer @sytses

See merge request !971
2015-07-13 17:53:27 +00:00
Dmitriy Zaporozhets 4a665e3f5d Merge branch 'scroll-sidebar' into 'master'
Scroll sidebar

On small screens content of sidebar does not fit. This merge request makes sidebar scrollable which makes it usable for tablets and small laptops.

This merge request has no screenshot because it brings no visual change. Its about action.

cc @darby @JobV

See merge request !972
2015-07-13 17:51:07 +00:00
karen Carias 3d6e67e44e fixed notifications title 2015-07-13 10:36:29 -07:00