deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3475 commits 6 branches 43 tags 25 MiB
Commit graph

3475 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexey Loktionov c954f2d982 issue #2118: fix undefined method for nil:NilClass exception 2012-11-29 19:39:30 +04:00
Dmitriy Zaporozhets 9df6f7bfad authorized_projects and authorized_groups methods for user 2012-11-29 17:17:01 +02:00
Dmitriy Zaporozhets 83f2a387d6 Merge pull request #2117 from koenpunt/scss-cleanup 
Scss cleanup
 2012-11-29 06:51:27 -08:00
Dmitriy Zaporozhets 1d889a79fb Fix group duplication on dashboard and project order in group 2012-11-29 16:43:09 +02:00
Koen Punt 1481bae559 Selective responsive bootstrap 2012-11-29 15:37:28 +01:00
Koen Punt 0f31392712 Mixins are now all with dashes instead of underscores 
(there really should be some convention for all gitlab css)
 2012-11-29 12:18:44 +01:00
Koen Punt d7e9eda24d renamed blue_link var to primary_color 2012-11-29 12:18:44 +01:00
Koen Punt df0bd0c212 Removed bg-gradient, now directly using linear-gradient 2012-11-29 12:18:44 +01:00
Koen Punt 81175073a0 removed overqualified mixins round-borders-* 2012-11-29 12:18:44 +01:00
Koen Punt 238c214ac9 Forgot to rename var 2012-11-29 12:18:44 +01:00
Koen Punt b825582eb1 replaced redundant -*-border-radius box-shadows and others with corresponding mixins 2012-11-29 12:18:44 +01:00
Koen Punt 84de1b71d1 Added some uniformity, all css properties and values are separated by a colon and a space : 2012-11-29 12:18:44 +01:00
Koen Punt 755e4a4700 Removed css declarations out of main.scss, so main is only a collector 
Fonts, variables and mixins are now all in their own stylesheets
 2012-11-29 12:18:44 +01:00
Dmitriy Zaporozhets eb1004f789 Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces 2012-11-29 12:39:03 +02:00
Saito a1ffc673b9 Merge pull request #2096 from panxiaoming/master 
can't open a chinese file name doc
 2012-11-29 02:02:22 -08:00
Dmitriy Zaporozhets cf8b3692cd Merge pull request #2105 from jouve/improve_admin_views 
Improve admin section
 2012-11-29 00:39:50 -08:00
Dmitriy Zaporozhets ff9a2e2a93 Improve admin logs 2012-11-29 07:49:11 +03:00
Dmitriy Zaporozhets a0aa0212a9 Removed feature: comments on wiki 2012-11-29 06:14:05 +03:00
Dmitriy Zaporozhets df03275eaa Merge pull request #1655 from zzet/feature/resque_fix 
fix resque start
 2012-11-28 10:35:32 -08:00
Dmitriy Zaporozhets f064459086 Merge pull request #2107 from AlexDenisov/projects_count_at_dashboard 
Projects count at dashboard
 2012-11-28 10:34:13 -08:00
Alex Denisov 34c2d8e82e authorized_for scope added to project 2012-11-28 20:09:13 +02:00
Alex Denisov 15a72a3b87 Spinach test added 2012-11-28 19:59:19 +02:00
Dmitriy Zaporozhets c873cf81f6 Restyled error messages in common way. Added title to head partial 2012-11-28 19:40:54 +02:00
Cyril e0a9ffcdaa Improve admin views for project and groups 
* layout: add 'Groups' item to main_menu
* admin/dashboard: add a ui-box for groups
* projects and groups: remove nav tabs
 2012-11-28 18:04:28 +01:00
Dmitriy Zaporozhets d8f825ef00 Merge pull request #2103 from tsigo/issue_project_link_rebase 
Add a link to each project on the Issues dashboard
 2012-11-28 08:39:44 -08:00
Robert Speicher 4db362f519 Add a link to each project on the Issues dashboard 2012-11-28 11:00:02 -05:00
Riyad Preukschas 3d242a3154 Fix GitLab Markdown helper spec 2012-11-28 16:05:58 +01:00
panxiaoming e2b73513f4 fixed the bug of URIDECODE error 
if link to a chinese file name, it will jump to error page;
for example, the chinese file name called "消息文档.md", when after urlencode, it will be "%E6%B6%88%E6%81%AF%E6%96%87%E6%A1%A3.md", but after use History.pushState, will jump to a bad decode link.
 2012-11-28 10:09:55 +08:00
Dmitriy Zaporozhets 7acd060400 Merge pull request #2095 from riyad/fix-code-highlighting 
Fix code highlighting
 2012-11-27 14:17:32 -08:00
Riyad Preukschas dc99b19af7 Fix CSS for code highlighting 2012-11-27 22:51:10 +01:00
Riyad Preukschas d2767221a5 Fix code blocks in Markdown not knowing about the user's color scheme 2012-11-27 22:51:07 +01:00
Riyad Preukschas 184a9ecaf6 Add user_color_scheme_class helper 2012-11-27 22:51:05 +01:00
Valeriy Sizov 99e1d9d8b9 Merge pull request #2093 from riyad/remove-sqlite 
Remove SQLite support
 2012-11-27 13:41:07 -08:00
Riyad Preukschas 0fbd9ac748 Remove SQLite support 2012-11-27 21:36:09 +01:00
Dmitriy Zaporozhets c4f3c54ecb Fix group spinach feature 2012-11-27 21:33:56 +02:00
Dmitriy Zaporozhets 4340112398 Remove unused responsive formats 2012-11-27 21:30:39 +02:00
Dmitriy Zaporozhets cfeddb554e Fix user creation cause of dual namespace build 2012-11-27 18:27:13 +00:00
Dmitriy Zaporozhets 81f8114f24 NamespacesHelper 2012-11-27 17:48:25 +02:00
Dmitriy Zaporozhets 039996bd0a Fix invalid method call for gitolite 2012-11-27 16:35:00 +02:00
Dmitriy Zaporozhets f5551efdfd Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues 2012-11-27 09:31:15 +03:00
Tanguy Herrmann 70ef433e09 Rewording for the account being blocked 
When signing in with SSO, if the default behaviour of gitlab is to block SSO user, the only message the people will get is 'Your account was blocked'

They should get the idea this might be only temporary and not because of a technical problem
 2012-11-24 18:21:57 +01:00
Dmitriy Zaporozhets 5f7dc99a62 Remove postrgres from travis.yml cause it fails 1week+ 2012-11-23 17:39:36 +02:00
Dmitriy Zaporozhets 319f0c3057 Merge branch 'master' into stable 
Conflicts:
	doc/install/installation.md
 2012-11-22 12:52:08 +02:00
Dmitriy Zaporozhets ced242a2d0 Up to 3.1.0 2012-11-22 12:45:16 +02:00
Dmitriy Zaporozhets 65327cfc08 Rewrite hooks shell script 2012-11-22 12:24:46 +02:00
Dmitriy Zaporozhets 6e3e3e7fd2 Merge pull request #2033 from mizzy/fix-hash-key-in-backup.rake 
Fix hash key settings["gitlab_version"] to settings[:gitlab_version]
 2012-11-22 00:51:24 -08:00
Gosuke Miyashita 71ff619973 Fix hash key settings["gitlab_version"] to settings[:gitlab_version] 
In backup_create, backup information hash is using symbol as its key.
But in backup_restore, string key is used and it returns empty value.
 2012-11-22 10:38:56 +09:00
Dmitriy Zaporozhets 9e8aadb0f0 Merge pull request #2026 from koenpunt/extended-image-diff 
Added bg for transparent images
 2012-11-21 12:56:06 -08:00
Dmitriy Zaporozhets 7392d28dca Merge pull request #2030 from tsigo/theme_feedback 
Improve user feedback on the Profile > Design page
 2012-11-21 12:54:22 -08:00
Robert Speicher 30a66c065a Improve user feedback on the Profile > Design page 
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
 2012-11-21 15:01:40 -05:00