Commit Graph
10629 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
Dmitriy Zaporozhets 4873034aa3 Merge pull request #4819 from croemmich/patch-1
Update to gitlab-shell 1.7.0 during 5.4-6.0 update
2013-08-20 12:28:19 -07:00
Dmitriy Zaporozhets 6ad88561d2 Fix wrong branch in install docs 2013-08-20 22:14:54 +03:00
Chris Roemmich df7d426d2f Update to gitlab-shell 1.7.0 during 5.4-6.0 update 2013-08-20 14:13:49 -05:00
Dmitriy Zaporozhets 5a664b3ca4 Fix bug in installation doc with non-install unicorn 2013-08-20 22:12:42 +03:00
Dmitriy Zaporozhets 817b9d1b47 Merge branch 'refactor/access_roles' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:10:40 +00:00
Dmitriy Zaporozhets d04ad4cb5d Merge pull request #4812 from hiroponz/remove-dependancy-of-grit
Remove the dependancy of grit from class Network::Graph
2013-08-20 12:09:35 -07: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 e9f1c39e7e Fix tests 2013-08-20 21:41:14 +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 9acaec7a26 Searching for issue/mr by iid in markdown 2013-08-20 17:31:26 +03:00
Dmitriy Zaporozhets a73e068c06 Fixing tests after adding iid for issues/mr 2013-08-20 16:56:05 +03:00
Dmitriy Zaporozhets 7a26a4b69d Refactor access roles methods 2013-08-20 15:59:45 +03:00
Dmitriy Zaporozhets a442ad2b14 Added Gitlab::Access module 2013-08-20 15:59:26 +03:00
MegaDiablo 90af8aa6fe add link on realisation api for java client 2013-08-20 14:35:49 +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
Hiroyuki Sato fd0afcc996 Remove the dependancy of grit from class Network::Graph 2013-08-20 12:05:23 +09: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
Dmitriy Zaporozhets 434c034159 Iid improvemets
* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard
2013-08-19 22:53:11 +03:00
Sytse Sijbrandij 6ec73fc9a6 Configure the relative path only one time. 2013-08-19 21:49:27 +02:00
Dmitriy Zaporozhets 20397091f1 Show iid in event feed and uatocomplete as default id for issues, mr 2013-08-19 22:12:59 +03:00
Dmitriy Zaporozhets 608f328653 Show iid as default id for issues, mr 2013-08-19 22:12:40 +03:00
Dmitriy Zaporozhets c1583c6d74 Find issues and Mr by iid in controller 2013-08-19 22:12:04 +03:00
Dmitriy Zaporozhets 2e5481b746 Create task to create iid for existing issues/mr 2013-08-19 22:11:18 +03:00
Dmitriy Zaporozhets 7047a44a26 Sett iid on create. Use iid as value to_param 2013-08-19 22:10:56 +03:00
Dmitriy Zaporozhets 125c07fa0a Add iid field to issues and MR 2013-08-19 22:10:21 +03: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
Rovanion Luckey e3dd374a6c Remove -y option when removing puby1.8
Since it is easily could break installations running on the server - hence the person doing the install should be able to make the decision to remove himself.
2013-08-17 00:37:22 +02: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
Dmitriy Zaporozhets 96e89ec36f Merge branch 'mention-unicorn' of /home/git/repositories/gitlab/gitlabhq 2013-08-16 09:56:08 +00:00
Sytse Sijbrandij 3bc4845874 Information about teams in changelog and switching to unicorn for all people. 2013-08-16 11:53:52 +02:00
Sytse Sijbrandij f7b922c687 Unix line endings. 2013-08-16 11:49:49 +02:00
Dmitriy Zaporozhets 81c0e163b8 Merge pull request #4791 from h2s/wording
Improvements to English text
2013-08-16 02:39:38 -07:00
Dmitriy Zaporozhets f2b3743819 Merge pull request #4789 from jojosch/fix-link-project-branches
Fix the link to the project branches
2013-08-15 13:29:01 -07:00
amouhziandHassan Amouhzi 39d8a64d25 Fixes grack authentification under relative_url_root
Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430
Ref: https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228

Add Rails' variable in application.rb to support relative url

This variable is used by assets compilation and other modules.

Note that user needs to change application.rb too

Restrict session cookie to the relative path if set.

Ref: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e

Fix Update attachment_uploader.rb bug with relative URL

See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace

Fix Wall relative bug with attachement files (javascript)
2013-08-15 21:25:09 +02:00