home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,432 Commits 48 Branches 340 Tags
b23b78ada12d1bbff4ea4e4bf65a34b223aeb8b4
Commit Graph
12432 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag 
Use button type=submit instead of input.
 2014-10-28 12:11:15 +02:00
Dmitriy Zaporozhets beabf5db8c Merge pull request #8091 from cirosantilli/factor-ability-abilities 
Factor abilities methods
 2014-10-28 12:09:55 +02:00
Dmitriy Zaporozhets 26175e4459 Merge pull request #8127 from cirosantilli/user-select-js-only-needed 
Run user select Js only where needed
 2014-10-28 12:08:57 +02:00
Sytse Sijbrandij 45d9446978 Merge pull request #8178 from dblessing/backport/update-doc 
Change update recommendation
 2014-10-27 11:27:05 -07:00
Dmitriy Zaporozhets 01441f544e Merge pull request #8120 from cirosantilli/profile-js-only-needed 
Only run profile js on pages that need it
 2014-10-27 20:01:47 +02:00
Ciro Santilli 2d187976be Run user select Js only where needed 
Transform current implementation into regular Coffescript classes
so that the same call method can be reused on the dispatcher
as for other classes.
 2014-10-27 18:28:36 +01:00
Dmitriy Zaporozhets 367d4db4cd Merge pull request #8155 from cirosantilli/unassigned 
Show nothing instead of unassigned on issues
 2014-10-27 19:21:26 +02:00
Dmitriy Zaporozhets 32a7d49a36 Merge pull request #8125 from cirosantilli/namespace-select-js-only-needed 
Only run namespace select js when needed
 2014-10-27 19:19:35 +02:00
Dmitriy Zaporozhets f4178f9601 Merge pull request #8005 from cirosantilli/settings-to-gitlab-config 
Use Gitlab.config instead of Settings everywhere
 2014-10-27 19:18:48 +02:00
Dmitriy Zaporozhets 243a74e995 Merge pull request #8123 from cirosantilli/project-js-only-needed 
Better js -> URL projects map to reduce unneeded execution
 2014-10-27 19:18:27 +02:00
Dmitriy Zaporozhets 08d361e8b3 Merge branch 'improve_release_doc' into 'master' 
Improvements for release documentation

See merge request !1203
 2014-10-27 16:56:22 +00:00
Valery Sizov fd44d0b6c2 update release doc 2014-10-27 16:02:21 +02:00
Dmitriy Zaporozhets 94d8698a85 Merge branch 'fix_raw_view_snippets' into 'master' 
Fix raw view snippets

See merge request !1220
 2014-10-27 13:56:57 +00:00
Drew Blessing 8101640c33 Change update recommendation 2014-10-27 08:30:57 -05:00
Valery Sizov f9885c0c3c Merge branch '7-4-stable-non-conflict' into 'master' 
7-4-stable to master.  With resolved conflicts

See merge request !1221
 2014-10-27 11:48:24 +00:00
Valery Sizov 21e8f43af3 Merge branch 'master' into 7-4-stable 
Conflicts:
	CHANGELOG
	VERSION
 2014-10-27 12:08:44 +02:00
Dmitriy Zaporozhets 2f6856f713 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-27 12:00:19 +02:00
Valery Sizov 40c8f159a2 Fix raw view for public snippets 2014-10-27 11:51:31 +02:00
Robert Schilling 199029b842 Merge pull request #8158 from cirosantilli/basename-dirname-split 
Merge File basename and direname into split
 2014-10-25 10:35:07 +02:00
Sytse Sijbrandij 6280b53f30 Merge branch 'update_patch_doc' into 'master' 
Update patch release document

See merge request !1218
 2014-10-24 20:32:07 +00:00
Valery Sizov 250d582bdd update patch document 2014-10-24 22:28:02 +03:00
Sytse Sijbrandij f6bed511cd Merge pull request #8126 from bbodenmiller/cleanup-release 
cleanup monthly release details
 2014-10-24 20:41:44 +02:00
Jacob Vosmaer 477743a154 Merge branch 'fix_internal_snippets' into '7-4-stable' 
Fix internal snippets

See merge request !1216
v7.4.2 		2014-10-24 17:18:46 +00:00
Valery Sizov 7f97a1277d internal snippets: fix exposing of title 2014-10-24 19:39:14 +03:00
Jacob Vosmaer ddc4e656fc Merge pull request #8159 from cirosantilli/fix-rake-import-existing-group 
Fix import.rake failed import if project name is also an existing namespace.
 2014-10-24 18:14:33 +02:00
Ciro Santilli 706b6b5acb Fix import.rake failed import if project name is 
also an existing namespace. E.g., when trying to import
group/root.git, that would fail if there is an user called root.
 2014-10-24 17:26:33 +02:00
Valery Sizov 9712fbcdd3 Bump to 7.4.1 v7.4.1 2014-10-24 13:30:04 +03:00
Jacob VosmaerandValery Sizov d4ae4fe670 Bump gitlab_git to 7.0.0.rc10 (submodules fix) 2014-10-24 13:24:27 +03:00
Valery Sizov cc42edfa49 Merge branch 'bump_gitlab_git' into 'master' 
Bump gitlab_git to 7.0.0.rc10 (submodules fix)

See merge request !1215
 2014-10-24 10:23:38 +00:00
Jacob VosmaerandValery Sizov 16a10eb1cd Fix LDAP config lookup for provider 'ldap' 2014-10-24 12:53:32 +03:00
Valery Sizov 5f7906e163 fix for public snippet 2014-10-24 12:52:59 +03:00
Marin Jankovski 8a7b864e41 Merge branch 'fix_public_snippets' into 'master' 
Fix public snippets

See merge request !1214
 2014-10-24 09:39:22 +00:00
Jacob Vosmaer 2bca55197b Bump gitlab_git to 7.0.0.rc10 (submodules fix) 2014-10-24 11:25:39 +02:00
Marin Jankovski 8157c6b8a5 Merge branch 'fix_ldap_config_lookup' into 'master' 
Fix LDAP config lookup for provider 'ldap'

See merge request !1213
 2014-10-24 09:03:00 +00:00
Valery Sizov 705652d625 fix for public snippet 2014-10-24 11:52:52 +03:00
Ciro Santilli 9be12dd9ca Merge File basename and direname into split 
Faster because only does one split in that case.
 2014-10-23 23:10:54 +02:00
Jacob Vosmaer 472a6621e9 Fix LDAP config lookup for provider 'ldap' 2014-10-23 22:57:16 +02:00
Jacob VosmaerandValery Sizov e8da077d4f Fix LDAP authentication for Git HTTP access 
Conflicts:
	CHANGELOG
 2014-10-23 17:53:19 +03:00
Marin Jankovski 1c1d9f78a4 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-23 16:41:39 +02:00
Marin Jankovski 568d60896a Merge branch 'ldap_http_access' into 'master' 
Fix LDAP authentication for Git HTTP access

See merge request !1211
 2014-10-23 14:41:03 +00:00
Ciro Santilli 2c14f9c41f Show nothing instead of unassigned on issues 2014-10-23 16:25:09 +02:00
Sytse Sijbrandij 6e9fb7facc Added relative dates, removed packages for GitLab.com. 2014-10-23 16:24:44 +02:00
Jacob Vosmaer 6b2b20af41 Fix LDAP authentication for Git HTTP access 2014-10-23 14:21:58 +02:00
Sytse Sijbrandij 30eaf4840b Merge branch 'apps-on-website' into 'master' 
Apps on website

See merge request !1210
 2014-10-23 12:12:58 +00:00
Robert Schilling 36649fc250 Merge pull request #8150 from cirosantilli/unecessary-variable-user 
Remove unused variable user at lib/gitlab/markdown
 2014-10-23 13:58:24 +02:00
Ciro Santilli 40815b2baf Remove unused variable user at lib/gitlab/markdown 2014-10-23 13:12:21 +02:00
Jacob Vosmaer 90e960f4ce Merge pull request #8088 from cirosantilli/sh-str-to-args 
Use argument list for sh instead of string
 2014-10-23 12:23:40 +02:00
Robert Schilling 744e11c324 Merge pull request #8053 from mr-vinn/fix-rspec-url 
Fix Rspec error when using non-default port
 2014-10-23 12:11:08 +02:00
Robert Schilling e80ef19b31 Merge pull request #8114 from cirosantilli/rm-global-avatar-js 
Only run avatar chooser Js on pages that need it
 2014-10-23 12:07:45 +02:00
Robert Schilling e6e5e63c29 Merge pull request #8118 from cirosantilli/user-groups-space-link 
Remove whitespace link between user group avatars
 2014-10-23 12:06:01 +02:00