Commit Graph
17725 Commits
Author SHA1 Message Date
Valery Sizov ad2bd1939e Merge branch 'update-7-13-stable' into '7-13-stable'
Update 7-13-stable (7.13.1)



See merge request !1033
2015-07-23 11:32:51 +00:00
Valery Sizov 494c672e61 update changelog 2015-07-23 14:29:57 +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 602806d786 update changelog 2015-07-23 14:19:53 +03:00
Valery Sizov 53ab844064 Merge branch 'update-to-7-13-stable' into '7-13-stable'
Update to 7-13-stable (7.13.1)



See merge request !1031
2015-07-23 10:40:05 +00:00
Valery Sizov 4bc6d1fb3d update changelog 2015-07-23 13:08:38 +03:00
Valery Sizov f26150a7f9 update changelog 2015-07-23 11:19:55 +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
Valery Sizov d303f598e0 update changelog 2015-07-23 11:08:11 +03:00
Marin JankovskiandValery Sizov 0e8dd6106b Check if session_expire_delay column exists before adding the column. 2015-07-23 11:06:57 +03:00
Hannes RosenöggerandValery Sizov b132127f5c revert caching of note text 2015-07-23 11:05:32 +03:00
Valery Sizov 94a9442722 update changelog 2015-07-23 11:04:50 +03:00
Jacob VosmaerandValery Sizov c3fd31c3b7 You need to store your DB encryption key 2015-07-23 11:03:56 +03:00
Valery Sizov 29861f24a6 revert cache issue 2015-07-23 11:02:17 +03:00
Valery Sizov 7d8636bd4d Version 7.13.0 v7.13.0 2015-07-22 11:40:32 +03:00
Valery Sizov a410a1651f Version 7.13.0.rc4 v7.13.0.rc4 2015-07-21 16:22:07 +03:00
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