OSDN Git Service
Dmitriy Zaporozhets [Sun, 2 Dec 2012 10:18:34 +0000 (02:18 -0800)]
Merge pull request #2138 from jouve/refactor_flash
refactor flash
Valeriy Sizov [Sat, 1 Dec 2012 22:02:53 +0000 (14:02 -0800)]
Merge pull request #2148 from jojosch/fix-2147
commit diff - check if prev_commit is not nil
Johannes Schleifenbaum [Sat, 1 Dec 2012 18:31:39 +0000 (19:31 +0100)]
commit diff - check if prev_commit is not nil
Dmitriy Zaporozhets [Sat, 1 Dec 2012 18:30:10 +0000 (10:30 -0800)]
Merge pull request #2141 from NARKOZ/notes-text-limit
remove length limit from notes
Cyril [Thu, 29 Nov 2012 21:51:51 +0000 (22:51 +0100)]
refactor flash
* make unobtrusive js
* convert js to coffee
Nihad Abbasov [Sat, 1 Dec 2012 11:19:16 +0000 (03:19 -0800)]
remove length limit from notes
Dmitriy Zaporozhets [Fri, 30 Nov 2012 20:50:06 +0000 (12:50 -0800)]
Merge pull request #2059 from dolanor/feature-rewording-blocked-users
Rewording for the account being blocked
Dmitriy Zaporozhets [Fri, 30 Nov 2012 20:48:27 +0000 (12:48 -0800)]
Merge pull request #2017 from duksis/backup_restore
bugfix: backup data retrieved with the same type keys as saved
Dmitriy Zaporozhets [Fri, 30 Nov 2012 17:49:51 +0000 (19:49 +0200)]
Added vendor/bundle to gitignore. Removed project js slugify
Dmitriy Zaporozhets [Fri, 30 Nov 2012 16:26:17 +0000 (18:26 +0200)]
Use project owner if no namespace. Restyled team page
Dmitriy Zaporozhets [Fri, 30 Nov 2012 14:47:04 +0000 (16:47 +0200)]
change version to 4.0.0pre
Dmitriy Zaporozhets [Fri, 30 Nov 2012 14:03:10 +0000 (16:03 +0200)]
Fix MR comments
Dmitriy Zaporozhets [Fri, 30 Nov 2012 03:14:05 +0000 (06:14 +0300)]
Filter projects on dashboard
Valeriy Sizov [Fri, 30 Nov 2012 09:19:29 +0000 (01:19 -0800)]
Merge pull request #2119 from erroric/fix_issue2118
issue #2118: fix undefined method for nil:NilClass exception
Valeriy Sizov [Fri, 30 Nov 2012 09:09:49 +0000 (01:09 -0800)]
Merge pull request #2127 from NARKOZ/notes-api
API: don't expose 'updated_at' for notes
Nihad Abbasov [Thu, 29 Nov 2012 23:52:56 +0000 (15:52 -0800)]
API: ability to create a wall note
Nihad Abbasov [Thu, 29 Nov 2012 22:41:24 +0000 (14:41 -0800)]
API: don't expose 'updated_at' for notes
Nihad Abbasov [Thu, 29 Nov 2012 22:26:18 +0000 (14:26 -0800)]
fix label name
Dmitriy Zaporozhets [Thu, 29 Nov 2012 21:05:57 +0000 (13:05 -0800)]
Merge pull request #2123 from NARKOZ/notes-api
Notes API
Nihad Abbasov [Thu, 29 Nov 2012 20:35:16 +0000 (12:35 -0800)]
update CHANGELOG
Nihad Abbasov [Thu, 29 Nov 2012 20:32:05 +0000 (12:32 -0800)]
add docs for notes API
Nihad Abbasov [Thu, 29 Nov 2012 20:10:07 +0000 (12:10 -0800)]
API: restore broken merge request commenting
Nihad Abbasov [Thu, 29 Nov 2012 20:06:24 +0000 (12:06 -0800)]
API: create new notes
Nihad Abbasov [Thu, 29 Nov 2012 19:33:41 +0000 (11:33 -0800)]
API: get a single note
Nihad Abbasov [Thu, 29 Nov 2012 19:21:14 +0000 (11:21 -0800)]
correct example
Nihad Abbasov [Tue, 27 Nov 2012 19:43:39 +0000 (11:43 -0800)]
API: list wall, snippet and issue notes
Dmitriy Zaporozhets [Thu, 29 Nov 2012 17:14:05 +0000 (20:14 +0300)]
Manage team from groups page. Phase 1
Dmitriy Zaporozhets [Thu, 29 Nov 2012 16:09:27 +0000 (18:09 +0200)]
Minor improvments to UI
Alexey Loktionov [Thu, 29 Nov 2012 15:38:06 +0000 (19:38 +0400)]
issue #2118: fix undefined method for nil:NilClass exception
Dmitriy Zaporozhets [Thu, 29 Nov 2012 15:17:01 +0000 (17:17 +0200)]
authorized_projects and authorized_groups methods for user
Dmitriy Zaporozhets [Thu, 29 Nov 2012 14:51:27 +0000 (06:51 -0800)]
Merge pull request #2117 from koenpunt/scss-cleanup
Scss cleanup
Dmitriy Zaporozhets [Thu, 29 Nov 2012 14:43:09 +0000 (16:43 +0200)]
Fix group duplication on dashboard and project order in group
Koen Punt [Thu, 29 Nov 2012 14:37:28 +0000 (15:37 +0100)]
Selective responsive bootstrap
Koen Punt [Tue, 27 Nov 2012 23:30:26 +0000 (00:30 +0100)]
Mixins are now all with dashes instead of underscores
(there really should be some convention for all gitlab css)
Koen Punt [Sun, 25 Nov 2012 19:03:14 +0000 (20:03 +0100)]
renamed blue_link var to primary_color
Koen Punt [Sun, 25 Nov 2012 18:25:33 +0000 (19:25 +0100)]
Removed bg-gradient, now directly using linear-gradient
Koen Punt [Sun, 25 Nov 2012 17:30:18 +0000 (18:30 +0100)]
removed overqualified mixins round-borders-*
Koen Punt [Sat, 24 Nov 2012 09:57:22 +0000 (10:57 +0100)]
Forgot to rename var
Koen Punt [Fri, 23 Nov 2012 16:51:38 +0000 (17:51 +0100)]
replaced redundant -*-border-radius box-shadows and others with corresponding mixins
Koen Punt [Fri, 23 Nov 2012 16:33:43 +0000 (17:33 +0100)]
Added some uniformity, all css properties and values are separated by a colon and a space `: `
Koen Punt [Fri, 23 Nov 2012 16:26:26 +0000 (17:26 +0100)]
Removed css declarations out of main.scss, so main is only a collector
Fonts, variables and mixins are now all in their own stylesheets
Dmitriy Zaporozhets [Thu, 29 Nov 2012 04:29:11 +0000 (07:29 +0300)]
Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces
Saito [Thu, 29 Nov 2012 10:02:22 +0000 (02:02 -0800)]
Merge pull request #2096 from panxiaoming/master
can't open a chinese file name doc
Dmitriy Zaporozhets [Thu, 29 Nov 2012 08:39:50 +0000 (00:39 -0800)]
Merge pull request #2105 from jouve/improve_admin_views
Improve admin section
Dmitriy Zaporozhets [Thu, 29 Nov 2012 04:49:11 +0000 (07:49 +0300)]
Improve admin logs
Dmitriy Zaporozhets [Thu, 29 Nov 2012 03:14:05 +0000 (06:14 +0300)]
Removed feature: comments on wiki
Dmitriy Zaporozhets [Wed, 28 Nov 2012 18:35:32 +0000 (10:35 -0800)]
Merge pull request #1655 from zzet/feature/resque_fix
fix resque start
Dmitriy Zaporozhets [Wed, 28 Nov 2012 18:34:13 +0000 (10:34 -0800)]
Merge pull request #2107 from AlexDenisov/projects_count_at_dashboard
Projects count at dashboard
Alex Denisov [Wed, 28 Nov 2012 18:09:13 +0000 (20:09 +0200)]
authorized_for scope added to project
Alex Denisov [Wed, 28 Nov 2012 17:59:19 +0000 (19:59 +0200)]
Spinach test added
Dmitriy Zaporozhets [Wed, 28 Nov 2012 17:40:54 +0000 (19:40 +0200)]
Restyled error messages in common way. Added title to head partial
Cyril [Wed, 28 Nov 2012 16:08:25 +0000 (17:08 +0100)]
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
Dmitriy Zaporozhets [Wed, 28 Nov 2012 16:39:44 +0000 (08:39 -0800)]
Merge pull request #2103 from tsigo/issue_project_link_rebase
Add a link to each project on the Issues dashboard
Robert Speicher [Tue, 20 Nov 2012 04:49:25 +0000 (23:49 -0500)]
Add a link to each project on the Issues dashboard
Riyad Preukschas [Wed, 28 Nov 2012 15:05:11 +0000 (16:05 +0100)]
Fix GitLab Markdown helper spec
panxiaoming [Wed, 28 Nov 2012 02:09:55 +0000 (10:09 +0800)]
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.
Dmitriy Zaporozhets [Tue, 27 Nov 2012 22:17:32 +0000 (14:17 -0800)]
Merge pull request #2095 from riyad/fix-code-highlighting
Fix code highlighting
Riyad Preukschas [Tue, 27 Nov 2012 21:50:24 +0000 (22:50 +0100)]
Fix CSS for code highlighting
Riyad Preukschas [Tue, 27 Nov 2012 21:49:52 +0000 (22:49 +0100)]
Fix code blocks in Markdown not knowing about the user's color scheme
Riyad Preukschas [Tue, 27 Nov 2012 21:49:22 +0000 (22:49 +0100)]
Add user_color_scheme_class helper
Valeriy Sizov [Tue, 27 Nov 2012 21:41:07 +0000 (13:41 -0800)]
Merge pull request #2093 from riyad/remove-sqlite
Remove SQLite support
Riyad Preukschas [Tue, 27 Nov 2012 20:36:09 +0000 (21:36 +0100)]
Remove SQLite support
Dmitriy Zaporozhets [Tue, 27 Nov 2012 19:33:56 +0000 (21:33 +0200)]
Fix group spinach feature
Dmitriy Zaporozhets [Tue, 27 Nov 2012 19:30:39 +0000 (21:30 +0200)]
Remove unused responsive formats
Dmitriy Zaporozhets [Tue, 27 Nov 2012 18:27:13 +0000 (18:27 +0000)]
Fix user creation cause of dual namespace build
Dmitriy Zaporozhets [Tue, 27 Nov 2012 15:48:25 +0000 (17:48 +0200)]
NamespacesHelper
Dmitriy Zaporozhets [Tue, 27 Nov 2012 14:35:00 +0000 (16:35 +0200)]
Fix invalid method call for gitolite
Dmitriy Zaporozhets [Tue, 27 Nov 2012 06:31:15 +0000 (09:31 +0300)]
Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues
Tanguy Herrmann [Sat, 24 Nov 2012 17:04:42 +0000 (18:04 +0100)]
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
Dmitriy Zaporozhets [Fri, 23 Nov 2012 15:39:36 +0000 (17:39 +0200)]
Remove postrgres from travis.yml cause it fails 1week+
Dmitriy Zaporozhets [Thu, 22 Nov 2012 10:45:16 +0000 (12:45 +0200)]
Up to 3.1.0
Dmitriy Zaporozhets [Thu, 22 Nov 2012 10:24:46 +0000 (12:24 +0200)]
Rewrite hooks shell script
Dmitriy Zaporozhets [Thu, 22 Nov 2012 08:51:24 +0000 (00:51 -0800)]
Merge pull request #2033 from mizzy/fix-hash-key-in-backup.rake
Fix hash key settings["gitlab_version"] to settings[:gitlab_version]
Gosuke Miyashita [Thu, 22 Nov 2012 01:38:56 +0000 (10:38 +0900)]
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.
Dmitriy Zaporozhets [Wed, 21 Nov 2012 20:56:06 +0000 (12:56 -0800)]
Merge pull request #2026 from koenpunt/extended-image-diff
Added bg for transparent images
Dmitriy Zaporozhets [Wed, 21 Nov 2012 20:54:22 +0000 (12:54 -0800)]
Merge pull request #2030 from tsigo/theme_feedback
Improve user feedback on the Profile > Design page
Robert Speicher [Wed, 21 Nov 2012 20:01:40 +0000 (15:01 -0500)]
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
Riyad Preukschas [Wed, 21 Nov 2012 19:26:37 +0000 (20:26 +0100)]
Fix rendering template for invalid notes
Riyad Preukschas [Wed, 21 Nov 2012 19:23:19 +0000 (20:23 +0100)]
Refactor GFM JS naming and access
Riyad Preukschas [Wed, 21 Nov 2012 19:02:03 +0000 (20:02 +0100)]
Fix GFM JS code style
Koen Punt [Wed, 21 Nov 2012 17:25:32 +0000 (18:25 +0100)]
added bg for transparent images
added width and height below images in diff
Dmitriy Zaporozhets [Wed, 21 Nov 2012 04:14:05 +0000 (07:14 +0300)]
Themes refactored
Dmitriy Zaporozhets [Wed, 21 Nov 2012 14:25:16 +0000 (06:25 -0800)]
Merge pull request #2023 from martinsp/master
fixes :notice after project is created in projects_controller
Martins Polakovs [Wed, 21 Nov 2012 12:21:12 +0000 (12:21 +0000)]
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
Dmitriy Zaporozhets [Wed, 21 Nov 2012 11:27:11 +0000 (13:27 +0200)]
Updated ROADMAP and CHANGELOG
Dmitriy Zaporozhets [Wed, 21 Nov 2012 10:52:55 +0000 (12:52 +0200)]
Updated README
Dmitriy Zaporozhets [Wed, 21 Nov 2012 10:45:15 +0000 (12:45 +0200)]
Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed
Dmitriy Zaporozhets [Wed, 21 Nov 2012 05:54:05 +0000 (08:54 +0300)]
Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo
Dmitriy Zaporozhets [Tue, 27 Nov 2012 04:29:11 +0000 (07:29 +0300)]
Show namespace in search autocomplete
Dmitriy Zaporozhets [Tue, 27 Nov 2012 09:53:24 +0000 (01:53 -0800)]
Merge pull request #2070 from jouve/fix_destroy_project
fix destroy project from admin
Dmitriy Zaporozhets [Tue, 27 Nov 2012 04:29:11 +0000 (07:29 +0300)]
Improved Issues and MR filters
Dmitriy Zaporozhets [Tue, 27 Nov 2012 03:14:05 +0000 (06:14 +0300)]
Update version and changelog
Cyril [Mon, 26 Nov 2012 00:22:44 +0000 (01:22 +0100)]
fix destroy project from admin
Dmitriy Zaporozhets [Sun, 25 Nov 2012 16:52:12 +0000 (18:52 +0200)]
project admin area - show project name with namespace
Dmitriy Zaporozhets [Sun, 25 Nov 2012 16:29:18 +0000 (18:29 +0200)]
remove invalid condition
Dmitriy Zaporozhets [Sun, 25 Nov 2012 16:24:27 +0000 (18:24 +0200)]
Improve activate_namespace task to build missing dirs and moving repos correctly
Dmitriy Zaporozhets [Sun, 25 Nov 2012 15:58:06 +0000 (17:58 +0200)]
Improved namespace activation task
Dmitriy Zaporozhets [Sun, 25 Nov 2012 15:07:01 +0000 (07:07 -0800)]
Merge pull request #2051 from gitlabhq/namespaces
User/Group namespaces for projects
Dmitriy Zaporozhets [Sun, 25 Nov 2012 14:53:49 +0000 (16:53 +0200)]
Removed unused spec
Dmitriy Zaporozhets [Sun, 25 Nov 2012 10:26:34 +0000 (12:26 +0200)]
Fixed user.namespace_id exception if namespace is nil