OSDN Git Service
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:14:05 +0000 (08:14 +0300)]
I prefer icons on header
Dmitriy Zaporozhets [Wed, 21 Nov 2012 05:14:05 +0000 (08:14 +0300)]
Use fieldset. Improved profile
Dmitriy Zaporozhets [Wed, 21 Nov 2012 03:14:05 +0000 (06:14 +0300)]
styled error message
Dmitriy Zaporozhets [Wed, 21 Nov 2012 07:14:15 +0000 (09:14 +0200)]
Restored old h6 of bootstrap. Fixed buttons line-height
Dmitriy Zaporozhets [Wed, 21 Nov 2012 07:04:32 +0000 (09:04 +0200)]
Add post-receive file content validation
Dmitriy Zaporozhets [Tue, 20 Nov 2012 22:40:29 +0000 (00:40 +0200)]
Use namespace for gitlab resque
Dmitriy Zaporozhets [Tue, 20 Nov 2012 22:18:36 +0000 (00:18 +0200)]
Fix tabs line height
Dmitriy Zaporozhets [Tue, 20 Nov 2012 22:10:45 +0000 (14:10 -0800)]
Merge pull request #1998 from erroric/gitlabhq_issue1669
fix for issue #1669
Dmitriy Zaporozhets [Tue, 20 Nov 2012 22:08:57 +0000 (14:08 -0800)]
Merge pull request #2022 from simonoff/master
Resque must be running in the own namespace
Dmitriy Zaporozhets [Tue, 20 Nov 2012 21:19:09 +0000 (21:19 +0000)]
Merge branch 'update/bootstrap2211' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 20 Nov 2012 21:18:44 +0000 (23:18 +0200)]
Fixed spec
Dmitriy Zaporozhets [Tue, 20 Nov 2012 21:05:15 +0000 (23:05 +0200)]
Implemented bootstrap 2.2.1.1. Restyled header panel
Dmitriy Zaporozhets [Tue, 20 Nov 2012 18:01:25 +0000 (20:01 +0200)]
update bootstrap to 2.2.1.1
Dmitriy Zaporozhets [Tue, 20 Nov 2012 17:34:05 +0000 (20:34 +0300)]
Add status badge for MR
Alexander Simonov [Tue, 20 Nov 2012 16:59:00 +0000 (18:59 +0200)]
Resque must be running in the own namespace
Alexander Simonov [Tue, 20 Nov 2012 16:57:45 +0000 (18:57 +0200)]
Clean old rails2 style code
Dmitriy Zaporozhets [Tue, 20 Nov 2012 14:46:22 +0000 (16:46 +0200)]
Fix method call for service hook
Dmitriy Zaporozhets [Tue, 20 Nov 2012 12:22:00 +0000 (14:22 +0200)]
User custom method for services array
Dmitriy Zaporozhets [Tue, 20 Nov 2012 12:19:55 +0000 (14:19 +0200)]
Reannotated
Dmitriy Zaporozhets [Tue, 20 Nov 2012 12:16:04 +0000 (14:16 +0200)]
Fix ci service creation logic
Dmitriy Zaporozhets [Mon, 19 Nov 2012 19:34:05 +0000 (22:34 +0300)]
GitLabCi Service imtegration
Dmitriy Zaporozhets [Mon, 19 Nov 2012 18:44:05 +0000 (21:44 +0300)]
Post Receive Refactored. Service hooks also triggered now
Dmitriy Zaporozhets [Mon, 19 Nov 2012 18:24:05 +0000 (21:24 +0300)]
Annotated. schema updated
Dmitriy Zaporozhets [Mon, 19 Nov 2012 18:14:05 +0000 (21:14 +0300)]
Service model and service hook
Dmitriy Zaporozhets [Mon, 19 Nov 2012 13:11:20 +0000 (15:11 +0200)]
resque via nohup
Dmitriy Zaporozhets [Mon, 19 Nov 2012 12:12:31 +0000 (04:12 -0800)]
Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner
Cannot remove user that owns a project.
Dmitriy Zaporozhets [Mon, 19 Nov 2012 12:11:41 +0000 (04:11 -0800)]
Merge pull request #1987 from barendt/patch-1
Update doc/development.md
Dmitriy Zaporozhets [Mon, 19 Nov 2012 12:11:18 +0000 (04:11 -0800)]
Merge pull request #2008 from Partugal/patch-default-order
add order for projects admin page
Dmitriy Zaporozhets [Mon, 19 Nov 2012 12:01:40 +0000 (14:01 +0200)]
Bigger file name for commits diff
Dmitriy Zaporozhets [Mon, 19 Nov 2012 12:01:49 +0000 (04:01 -0800)]
Merge pull request #2011 from koenpunt/extended-image-diff
Optimized commit diff views, now showing file size and file mode changes
Dmitriy Zaporozhets [Mon, 19 Nov 2012 10:33:09 +0000 (02:33 -0800)]
Merge pull request #2009 from gitlabhq/hook_on_mr_fix
Fix hooks for merge requests which were accepted by web-interface
Dmitriy Zaporozhets [Mon, 19 Nov 2012 06:34:27 +0000 (22:34 -0800)]
Merge pull request #1981 from riyad/update-gems
Update Gems
Riyad Preukschas [Sun, 18 Nov 2012 20:51:49 +0000 (21:51 +0100)]
Update gems
Riyad Preukschas [Wed, 14 Nov 2012 13:45:15 +0000 (14:45 +0100)]
Update Rails config
Sergey Linnik [Sun, 18 Nov 2012 18:36:22 +0000 (22:36 +0400)]
add order to projects admin page
Valeriy Sizov [Sun, 18 Nov 2012 17:53:30 +0000 (19:53 +0200)]
Fix hooks for merge request which were accepted by web-interface
Koen Punt [Sun, 18 Nov 2012 16:41:41 +0000 (17:41 +0100)]
Optimized commit diff views, now showing file size and file mode changes
Replaced commit status images (diff_file_*.png) with fontawesome icons
Riyad Preukschas [Sat, 17 Nov 2012 21:25:48 +0000 (22:25 +0100)]
Fix type error if there is a different location hash
Valeriy Sizov [Sat, 17 Nov 2012 16:31:39 +0000 (08:31 -0800)]
Merge pull request #2000 from riyad/fix-editor
Fix editor
Riyad Preukschas [Sat, 17 Nov 2012 14:43:13 +0000 (15:43 +0100)]
Fix editor form, styles and JS
Riyad Preukschas [Sat, 17 Nov 2012 14:28:32 +0000 (15:28 +0100)]
Fix setting Ace mode
Riyad Preukschas [Sat, 17 Nov 2012 00:00:26 +0000 (01:00 +0100)]
Fix Haml indenting file content
Alexey Loktionov [Fri, 16 Nov 2012 18:31:17 +0000 (22:31 +0400)]
fix projects sorting; fix Postgresql issue with LIMIT and DISTINCT; fix query performance
Marin Jankovski [Fri, 2 Nov 2012 11:26:41 +0000 (12:26 +0100)]
Cannot remove user that owns a project.
Cannot remove user that owns a project.
Make lines shorter, set alert, use path instead of url.
Dmitriy Zaporozhets [Fri, 16 Nov 2012 11:46:43 +0000 (03:46 -0800)]
Merge pull request #1937 from riyad/add-file-line-links
Add file line links
Dmitriy Zaporozhets [Fri, 16 Nov 2012 11:03:07 +0000 (13:03 +0200)]
Fix pre-selected assignee spinach
Dmitriy Zaporozhets [Fri, 16 Nov 2012 10:54:35 +0000 (12:54 +0200)]
Another try for phantom
Dmitriy Zaporozhets [Fri, 16 Nov 2012 10:47:09 +0000 (12:47 +0200)]
new phantomjs for travis
Valeriy Sizov [Fri, 16 Nov 2012 10:33:19 +0000 (02:33 -0800)]
Merge pull request #1995 from gitlabhq/feature/poltergeist
Use poltergeist instaead of capybara-webkit
Dmitriy Zaporozhets [Fri, 16 Nov 2012 10:27:39 +0000 (12:27 +0200)]
Use poltergeist instaead of capybara-webkit
Greg Barendt [Wed, 14 Nov 2012 18:33:22 +0000 (13:33 -0500)]
Update doc/development.md
Fixed a typo.
Riyad Preukschas [Wed, 14 Nov 2012 13:36:51 +0000 (14:36 +0100)]
Fix Notes JS
Also fixes #1983
Dmitriy Zaporozhets [Wed, 14 Nov 2012 11:14:46 +0000 (13:14 +0200)]
Rails up to 3.2.9
Riyad Preukschas [Wed, 14 Nov 2012 00:20:37 +0000 (01:20 +0100)]
Fix specs
Dmitriy Zaporozhets [Tue, 13 Nov 2012 20:11:56 +0000 (22:11 +0200)]
Improved seeds for development env
Dmitriy Zaporozhets [Tue, 13 Nov 2012 19:26:36 +0000 (21:26 +0200)]
Improve Commits stats code
Dmitriy Zaporozhets [Tue, 13 Nov 2012 16:45:03 +0000 (08:45 -0800)]
Merge pull request #1928 from kouno/cleanup-factories
Remove backward compatibility of factories.
Dmitriy Zaporozhets [Tue, 13 Nov 2012 16:44:05 +0000 (08:44 -0800)]
Merge pull request #1958 from japgolly/git_commit_fix
Ensure git can commit and prevent it from failing silently
Saito [Tue, 13 Nov 2012 15:32:18 +0000 (07:32 -0800)]
Merge pull request #1968 from shtirlic/fix_thin
Update thin closes #1765 and maybe #1051
Vincent Bonmalais [Tue, 6 Nov 2012 03:31:55 +0000 (14:31 +1100)]
Remove backward compatibility of factories.
Dmitriy Zaporozhets [Tue, 13 Nov 2012 10:36:41 +0000 (12:36 +0200)]
Fix loader hiding when create new project
David Barri [Sun, 11 Nov 2012 10:27:55 +0000 (21:27 +1100)]
Merge remote-tracking branch 'gitlabhq/master' into git_commit_fix
Conflicts:
doc/install/installation.md
Dmitriy Zaporozhets [Sat, 10 Nov 2012 22:08:42 +0000 (00:08 +0200)]
Improve lists. Remove unneccessary padding
Dmitriy Zaporozhets [Sat, 10 Nov 2012 21:45:13 +0000 (23:45 +0200)]
Fix margin-right for some avatars
randx [Sat, 10 Nov 2012 21:33:10 +0000 (23:33 +0200)]
Added feature test for stats
randx [Sat, 10 Nov 2012 21:08:47 +0000 (23:08 +0200)]
Stats page
shtirlic [Sat, 10 Nov 2012 16:30:22 +0000 (20:30 +0400)]
Update thin closes #1765 and maybe #1051
Riyad Preukschas [Sat, 10 Nov 2012 09:47:30 +0000 (10:47 +0100)]
Use pygments.rb fork with a custom formatter
Riyad Preukschas [Fri, 9 Nov 2012 23:55:56 +0000 (00:55 +0100)]
Fix 500s because of "missing" lexer
Riyad Preukschas [Fri, 9 Nov 2012 23:03:46 +0000 (00:03 +0100)]
Allow linking to file lines
Supported formats: "L12" for single lines and "L12-34" for multiple lines
Riyad Preukschas [Tue, 6 Nov 2012 21:56:53 +0000 (22:56 +0100)]
Add jQuery.ScrollTo
Saito [Fri, 9 Nov 2012 17:36:55 +0000 (01:36 +0800)]
linguist will take care of this
Saito [Fri, 9 Nov 2012 17:06:20 +0000 (01:06 +0800)]
linguist and web browser will take care of mimetype and encoding problem.
Saito [Fri, 9 Nov 2012 16:09:31 +0000 (08:09 -0800)]
Merge pull request #1964 from jdamick/patch-1
Update app/views/notify/project_access_granted_email.html.haml
jdamick [Fri, 9 Nov 2012 16:03:42 +0000 (11:03 -0500)]
Update app/views/notify/project_access_granted_email.html.haml
changing wording to sound more better.
Dmitriy Zaporozhets [Fri, 9 Nov 2012 13:24:28 +0000 (15:24 +0200)]
charlock_holmes up to 0.6.9 for travis and setup docs
Dmitriy Zaporozhets [Fri, 9 Nov 2012 13:17:50 +0000 (15:17 +0200)]
Use grit_ext fork of gitlabhq
Dmitriy Zaporozhets [Fri, 9 Nov 2012 13:18:15 +0000 (05:18 -0800)]
Merge pull request #1956 from SaitoWu/grit_ext
release a new version of grit_ext, added it into Gitlab.
Valeriy Sizov [Fri, 9 Nov 2012 09:15:36 +0000 (01:15 -0800)]
Merge pull request #1955 from dosire/patch-2
Add pointer about alternative platforms
David Barri [Thu, 8 Nov 2012 21:32:00 +0000 (08:32 +1100)]
Fix for git commit when nothing to commit.
Turns out git commit returns with 128 when user.name config not present.
Saito [Thu, 8 Nov 2012 17:59:14 +0000 (01:59 +0800)]
bump grit_ext version to 0.6.0
Saito [Thu, 8 Nov 2012 17:41:07 +0000 (01:41 +0800)]
remove encode lib, clean all encoded area.
Saito [Thu, 8 Nov 2012 14:47:12 +0000 (22:47 +0800)]
add grit_ext to gemfile
Sytse Sijbrandij [Thu, 8 Nov 2012 14:43:01 +0000 (15:43 +0100)]
Add pointer about alternative platforms