Commit graph

3003 commits

Author SHA1 Message Date
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 0046409970 I prefer icons on header 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets 6bf656970d Use fieldset. Improved profile 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets d18e2bd59d styled error message 2012-11-21 06:14:05 +03:00
Dmitriy Zaporozhets c1c1a1eeee Restored old h6 of bootstrap. Fixed buttons line-height 2012-11-21 09:14:15 +02:00
Dmitriy Zaporozhets 3ab33fcfca Add post-receive file content validation 2012-11-21 09:04:32 +02:00
Dmitriy Zaporozhets b39002ce88 Use namespace for gitlab resque 2012-11-21 00:40:29 +02:00
Dmitriy Zaporozhets ec7a1c504f Fix tabs line height 2012-11-21 00:18:36 +02:00
Dmitriy Zaporozhets dc9916b474 Merge pull request #1998 from erroric/gitlabhq_issue1669
fix for issue #1669
2012-11-20 14:10:45 -08:00
Dmitriy Zaporozhets 68b119f62f Merge pull request #2022 from simonoff/master
Resque must be running in the own namespace
2012-11-20 14:08:57 -08:00
Dmitriy Zaporozhets 752468b20c Merge branch 'update/bootstrap2211' of dev.gitlabhq.com:gitlabhq 2012-11-20 21:19:09 +00:00
Dmitriy Zaporozhets 4d846c09b1 Fixed spec 2012-11-20 23:18:44 +02:00
Dmitriy Zaporozhets 942c410119 Implemented bootstrap 2.2.1.1. Restyled header panel 2012-11-20 23:05:15 +02:00
Dmitriy Zaporozhets 236584c2f8 update bootstrap to 2.2.1.1 2012-11-20 20:01:25 +02:00
Dmitriy Zaporozhets ebcbe0c87b Add status badge for MR 2012-11-20 20:34:05 +03:00
Alexander Simonov 18bc873d53 Resque must be running in the own namespace 2012-11-20 18:59:37 +02:00
Alexander Simonov 10d8b77b50 Clean old rails2 style code 2012-11-20 18:59:28 +02:00
Dmitriy Zaporozhets ed92cfdebd Fix method call for service hook 2012-11-20 16:46:22 +02:00
Dmitriy Zaporozhets f6248c255e User custom method for services array 2012-11-20 14:22:00 +02:00
Dmitriy Zaporozhets 93fdc4ca9d Reannotated 2012-11-20 14:19:55 +02:00
Dmitriy Zaporozhets 9f65c274ef Fix ci service creation logic 2012-11-20 14:16:04 +02:00
Dmitriy Zaporozhets 406a0c809b GitLabCi Service imtegration 2012-11-19 22:34:05 +03:00
Dmitriy Zaporozhets 8500743464 Post Receive Refactored. Service hooks also triggered now 2012-11-19 21:44:05 +03:00
Dmitriy Zaporozhets 95c23b2f97 Annotated. schema updated 2012-11-19 21:24:05 +03:00
Dmitriy Zaporozhets c3b074acab Service model and service hook 2012-11-20 11:33:49 +02:00
Dmitriy Zaporozhets be1dc5544a resque via nohup 2012-11-19 15:11:20 +02:00
Dmitriy Zaporozhets 4eef112462 Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner
Cannot remove user that owns a project.
2012-11-19 04:12:31 -08:00
Dmitriy Zaporozhets c403c2a8e1 Merge pull request #1987 from barendt/patch-1
Update doc/development.md
2012-11-19 04:11:41 -08:00
Dmitriy Zaporozhets cd15e89135 Merge pull request #2008 from Partugal/patch-default-order
add order for projects admin page
2012-11-19 04:11:18 -08:00
Dmitriy Zaporozhets 6878f55620 Bigger file name for commits diff 2012-11-19 14:01:40 +02:00
Dmitriy Zaporozhets 86b181398c Merge pull request #2011 from koenpunt/extended-image-diff
Optimized commit diff views, now showing file size and file mode changes
2012-11-19 04:01:49 -08:00
Dmitriy Zaporozhets 22f6e2d765 Merge pull request #2009 from gitlabhq/hook_on_mr_fix
Fix hooks for merge requests which were accepted by web-interface
2012-11-19 02:33:09 -08:00
Dmitriy Zaporozhets 36bbcc6fd6 Merge pull request #1981 from riyad/update-gems
Update Gems
2012-11-18 22:34:27 -08:00
Riyad Preukschas 20189f84ee Update gems 2012-11-18 21:51:53 +01:00
Riyad Preukschas 527d223680 Update Rails config 2012-11-18 21:51:53 +01:00
Sergey Linnik bb3fc1e04e add order to projects admin page 2012-11-18 22:36:22 +04:00
Valeriy Sizov e226551e81 Fix hooks for merge request which were accepted by web-interface 2012-11-18 19:56:29 +02:00