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

4650 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Riyad Preukschas d7ce2c5c07 Fix rendering template for invalid notes 2012-11-21 20:26:37 +01:00
Riyad Preukschas 3e800c3bb1 Refactor GFM JS naming and access 2012-11-21 20:25:49 +01:00
Riyad Preukschas 1cda62465f Fix GFM JS code style 2012-11-21 20:05:37 +01:00
Koen Punt 1de0ea28b9 added bg for transparent images 
added width and height below images in diff
 2012-11-21 18:27:21 +01:00
Dmitriy Zaporozhets 4c6c24856c Themes refactored 2012-11-21 18:19:03 +02:00
Dmitriy Zaporozhets 9477448ac0 Merge pull request #2023 from martinsp/master 
fixes :notice after project is created in projects_controller
 2012-11-21 06:25:16 -08:00
Martins Polakovs 8c5b79a923 Fixes :notice after project is created 
When projects were created in projects_controller
create.js.haml passed notice as url parameter and
therefore notice was not displayed in the page after
redirect to the project page
 2012-11-21 14:30:35 +02:00
Dmitriy Zaporozhets cc5391515a Updated ROADMAP and CHANGELOG 2012-11-21 13:27:11 +02:00
Dmitriy Zaporozhets a0f2f05e50 Updated README 2012-11-21 12:52:55 +02:00
Dmitriy Zaporozhets 898d09a21e Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed 2012-11-21 12:45:15 +02:00
Dmitriy Zaporozhets 70bf7f6e19 Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo 2012-11-21 08:54:05 +03:00
Dmitriy Zaporozhets cc52eed981 Show namespace in search autocomplete 2012-11-27 07:29:11 +03:00
Dmitriy Zaporozhets 285743eee1 Merge pull request #2070 from jouve/fix_destroy_project 
fix destroy project from admin
 2012-11-27 01:53:24 -08:00
Dmitriy Zaporozhets d7c5885c3d Improved Issues and MR filters 2012-11-27 07:29:11 +03:00
Dmitriy Zaporozhets ade80e5c4d Update version and changelog 2012-11-27 06:14:05 +03:00
Cyril b382ce4d91 fix destroy project from admin 2012-11-26 01:22:44 +01:00
Dmitriy Zaporozhets 1d857aae17 project admin area - show project name with namespace 2012-11-25 18:52:12 +02:00
Dmitriy Zaporozhets ae282f6326 remove invalid condition 2012-11-25 18:29:18 +02:00
Dmitriy Zaporozhets 04b51a2b89 Improve activate_namespace task to build missing dirs and moving repos correctly 2012-11-25 18:24:27 +02:00
Dmitriy Zaporozhets fbe03c506f Improved namespace activation task 2012-11-25 17:58:06 +02:00
Dmitriy Zaporozhets be942d74af Merge pull request #2051 from gitlabhq/namespaces 
User/Group namespaces for projects
 2012-11-25 07:07:01 -08:00
Dmitriy Zaporozhets 1d7fdf45ff Removed unused spec 2012-11-25 16:53:49 +02:00
Dmitriy Zaporozhets 97a92f8ae7 Fixed user.namespace_id exception if namespace is nil 2012-11-25 12:26:34 +02:00
Dmitriy Zaporozhets c31d48dd25 Allow project creation in scope of group for non-admin but group owners 2012-11-25 11:57:01 +02:00
Dmitriy Zaporozhets 2f22874ba6 Fix group assoc. Show namespace in project list 2012-11-24 22:39:51 +02:00
Dmitriy Zaporozhets 65c470e843 Reannotated 2012-11-24 22:16:51 +02:00
Dmitriy Zaporozhets 3f1d6d6ab3 move namespace dir after path changed 2012-11-24 22:11:46 +02:00
Dmitriy Zaporozhets f37fa968b2 add ability to change namespace from project edit page 2012-11-24 22:00:30 +02:00