Commit Graph
6232 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 10b0b8f179 Merge branch '6-0-stable' of github.com:gitlabhq/gitlabhq into 6-0-stable 2013-10-04 15:47:56 +03:00
Dmitriy Zaporozhets 792d0db12f Merge branch 'backport-init-script' of /home/git/repositories/gitlab/gitlabhq into 6-0-stable 2013-10-04 11:18:25 +00:00
Sytse Sijbrandij dd4281158c Backport init script because it is much better. 2013-10-02 21:48:47 +02:00
Jacob Vosmaer 7e96df0e59 Merge pull request #5241 from earlonrails/patch-1
Update app version in init script
2013-10-02 08:17:06 -07:00
Kevin Krauss 3e8e41fcfa Update gitlab 2013-10-01 11:50:30 -07:00
Jacob Vosmaer 00f33e6131 Merge pull request #4891 from denics/patch-2
Add mysql_secure_installation to databases.md
2013-09-27 02:30:51 -07:00
Dmitriy Zaporozhets e0b736228e Merge pull request #5082 from twistedR/6-0-stable
Fixed the link to the init script
2013-09-14 08:09:12 -07:00
twistedR fbd05acb2c Fixed the link to the init script
The init script was pointing to the master branch rather than the 6-0-stable causing the rake gitlab:check to think it is out of date.
2013-09-13 16:13:39 -04:00
Dmitriy Zaporozhets 87ee40308e Version 6.0.2
Includes next fixes:
* Respect group members in mentionable concern - 6263598314
* Improve commit diff - 9109a20758
* User cannot select namespace for new project - e19526c2ac
v6.0.2
2013-09-11 21:34:04 +03:00
Stephen HoldawayandDmitriy Zaporozhets 1c2be67122 Fix several_namespaces? to work with multiple ownership of groups 2013-09-11 20:44:44 +03:00
Dmitriy Zaporozhets ea55707b40 Improve commit diff
* show highlights when replace empty line with content
* show inline diff when replace line with spaces with content
2013-09-11 20:44:29 +03:00
Dmitriy Zaporozhets 8b3ada75b0 Respect group members in mentionable concern 2013-09-11 20:44:16 +03:00
Jacob Vosmaer d422ee0f11 Merge pull request #4974 from endzyme/patch-1
Update Gitlab-shell to newest
2013-09-04 00:39:30 -07:00
Dmitriy Zaporozhets 4606412d8e version 6.0.1 v6.0.1 2013-09-03 20:59:14 +03:00
Steven MokandDmitriy Zaporozhets d37b0e6d5c Select files with diff filter for graph log 2013-09-03 20:58:28 +03:00
Dmitriy Zaporozhets e3d1633a97 Dont allow html render for RAW view 2013-09-03 20:56:17 +03:00
Nick Huanca 4ca1baec44 Update Gitlab-shell to newest
newest version of gitlab-shell avail. (has bug fix)
2013-09-03 07:57:47 -06:00
Dmitriy Zaporozhets 6c1c2842ec Merge pull request #4895 from axilleas/clear-cache
Clear redis cache and precompile assets during update to 6.0. Fix #4874 #4840
2013-08-26 02:33:17 -07:00
Axilleas Pipinellis 6046fd4dbe Clear redis cache and precompile assets during update to 6.0. Fix #4874 #4840
As a consequence on the namespaces change from 5.4 to 6.0, after upgrade
lots of links on the dashboard were not working (pointing to projects
without the group part on the url).
Also, after upgrading to 6.0-stable, the network (branch history) function
does not work. The progress bar rotates forever, but the network graph cannot
be generated.

Clearing redis cache fixes those issues.
2013-08-26 10:09:53 +03:00
Denix a7230d5ddf Update databases.md
run mysql_secure_installation to secure the freshly installed mysql server
2013-08-25 23:37:42 +02:00
Dmitriy Zaporozhets b1bb3701b7 Merge pull request #4862 from dsekretov/patch-1
Update 20130419190306_allow_merges_for_forks.rb
2013-08-25 11:46:35 -07:00
Dmitriy Zaporozhets 1ac6078b05 Fixed 500 error when try to remove group 2013-08-24 22:44:51 +03:00
dsekretov 8c4554bd23 Update 20130419190306_allow_merges_for_forks.rb
Postgress db migrate fails.(5.4=>6.0)
2013-08-23 13:34:08 +04:00
Dmitriy Zaporozhets 86c9737307 Fix issue when project owner cant close MR from forked project 2013-08-22 17:50:24 +03:00
Chris RoemmichandDmitriy Zaporozhets 2afd4aaa17 Update to gitlab-shell 1.7.0 during 5.4-6.0 update 2013-08-22 17:33:02 +03:00
Dmitriy Zaporozhets 4c8f3699f1 Fix branch name for update docs 2013-08-21 12:36:38 +03:00
Dmitriy Zaporozhets 5246d63f83 Fix wrong branch in install docs 2013-08-20 22:14:22 +03:00
Dmitriy Zaporozhets a9de805eb1 Fix bug in installation doc with non-install unicorn 2013-08-20 22:13:00 +03:00
Dmitriy Zaporozhets 27e532b426 Time for 6.0.0 v6.0.0 2013-08-20 22:05:58 +03:00
Dmitriy Zaporozhets e7f92c8a16 Bold names for public projects 2013-08-20 21:50:33 +03:00
Dmitriy Zaporozhets 25e629e460 Render small avatars for inline events 2013-08-20 21:31:37 +03:00
Dmitriy Zaporozhets 9174020f14 Fix event image preview 2013-08-20 21:20:11 +03:00
Dmitriy Zaporozhets b3b9b75616 Dashboard event right margin + increased padding 2013-08-20 21:09:54 +03:00
Dmitriy Zaporozhets 23f53c43ce Rename wiki repo if project repo was removed 2013-08-20 17:44:15 +03:00
Dmitriy Zaporozhets 7daf394732 Its time for 6.0.0rc1 2013-08-20 12:41:56 +03:00
Dmitriy Zaporozhets b66f4898ea Better message for migrating global projects 2013-08-20 12:40:51 +03:00
Dmitriy Zaporozhets 65cba5c6b9 Merge branch 'init-script-should-restart-unicorn' of /home/git/repositories/gitlab/gitlabhq 2013-08-19 20:22:14 +00:00
Sytse Sijbrandij 63009af117 Relative root needs to be changed in three places. 2013-08-19 22:20:32 +02:00
Sytse Sijbrandij 7c55c73d63 Fix confusing situation where install guide told you to install init.d script for puma. 2013-08-19 21:54:12 +02:00
Sytse Sijbrandij 6ec73fc9a6 Configure the relative path only one time. 2013-08-19 21:49:27 +02:00
Dmitriy Zaporozhets 4250c34915 Make repo graph work for large repos on slower machines 2013-08-19 20:11:41 +03:00
Dmitriy Zaporozhets fd7c8c71e5 its time for beta 2013-08-19 18:52:19 +03:00
Dmitriy Zaporozhets a410bc1289 Merge pull request #4670 from anezi/relative-url-patch
More fixes for supporting Relative URL
2013-08-19 05:42:20 -07:00
Dmitriy Zaporozhets 1a3ca6b149 Merge pull request #4797 from mbajur/flashes-revived
Make flash messages fixed and sticked to bottom
2013-08-19 03:32:31 -07:00
Mike Bajur 798f7db24f Update flash message timeout to 5 seconds 2013-08-17 16:36:44 +02:00
GitLab 533ef87b13 Make flash messages fixed and sticked to bottom 2013-08-17 06:32:59 -04:00
Dmitriy Zaporozhets 0e387919c3 Fixed wrong last-edit time for wiki 2013-08-16 16:59:26 +03:00
Dmitriy Zaporozhets ffa234bc80 Dont render event body if empty 2013-08-16 15:40:55 +03:00
Dmitriy Zaporozhets 14db704231 Minor UI improvements to event feed 2013-08-16 15:37:42 +03:00
Dmitriy Zaporozhets 37e1f53734 Reduce padding for events on dashboard 2013-08-16 15:28:32 +03:00