Commit Graph
14039 Commits
Author SHA1 Message Date
Marin Jankovski 50ee0b81b8 Leave the project name field editable, fix the test. 2014-10-28 09:19:58 +01:00
Ben Bodenmiller 56ffa0fba4 improve ssh key emails 2014-10-28 00:06:22 -07:00
Ben Bodenmiller 6093d4fd83 fix markdown formatting
fix markdown formatting issue
2014-10-27 23:28:02 -07: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
Ciro Santilli 951abce562 Factor behaviors.scss constants 2014-10-27 18:13:01 +01: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
Marin Jankovski d08bb4b3a4 Add project name to rename repository section 2014-10-27 16:08:11 +01:00
Marin Jankovski 28c08775b3 Add a comment in interceptor spec. 2014-10-27 15:11:03 +01:00
Marin Jankovski 3b6737f970 Add interceptor test. 2014-10-27 15:08:37 +01: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
Marin Jankovski d78e80fa74 Add email interceptor to prevent mail sending if email sending is disabled. 2014-10-27 13:05:50 +01:00
Marin Jankovski d504ca8a0c Add settings to disable email sending from GitLab. 2014-10-27 13:02:12 +01: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
Marin Jankovski d3bdd3ba67 Do not filter out issues and merge requests related to user right away. 2014-10-27 10:02:20 +01:00
Marin Jankovski 5e017a4566 Assigned merge request should show on dashboard mr overiew feature spec. 2014-10-27 09:53:35 +01:00
Marin Jankovski 93532432dc Failing feature for dashboard merge requests when user has authored issues on forked project source. 2014-10-27 09:30:39 +01:00
Marin Jankovski d747612385 Failing feature for dashboard issues when user has authored issues on projects he is not a member of. 2014-10-27 09:20:43 +01:00
Ciro Santilli a9fadce361 Create dev fixture projects with fixed visibility 2014-10-26 11:34:50 +01: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
Robert Schilling 55cf3a5b1a Merge pull request #8162 from jmsche/patch-1
Fixed missing end-of-code line in 7.4 upgrade doc
2014-10-25 09:55:28 +02:00
Patricio Cano 37f33393b2 Changed colors to match GitLab's red & green and softened the yellow. 2014-10-24 19:17:00 -05:00
Patricio Cano 000af8d5d7 Moved require from application.js to password_strength.js
Corrected div id for profile password/edit
Added first spinach tests
2014-10-24 17:19:35 -05:00
Ciro Santilli e4912243c1 Transform remove blob link into button. 2014-10-24 23:44:30 +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
jmsche 5c74abb590 Fixed missing end-of-code line in 7.4 upgrade doc 2014-10-24 22:00:21 +02: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