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

3129 commits

This branch
This branch
All branches
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 ab42370af0 Fix sattellites 2012-11-21 09:14:05 +03:00
Dmitriy Zaporozhets 23734a715e Dashboard filters for events 2012-11-21 08:24:05 +03:00
Dmitriy Zaporozhets 899afd0067 Fix snippet render issue cause of haml preserve 2012-11-26 07:14:05 +03:00
Dmitriy Zaporozhets 29636d4dab Fix snippet render error 2012-11-26 06:14:05 +03:00
Dmitriy Zaporozhets a4e6ab0a29 Fixing and commenting tests 2012-11-26 14:44:29 +02:00
Dmitriy Zaporozhets e750efd9fc Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests 
Diff and patch for commits and merge requests
 2012-11-26 04:40:49 -08:00
Dmitriy Zaporozhets 2d5a6fc850 Fix dir permission on creation 2012-11-26 13:07:16 +02:00
Dmitriy Zaporozhets ca8bb9dff8 Fix projectmover dir permission 2012-11-26 12:52:49 +02:00
Dmitriy Zaporozhets 7ae851f642 Fix critical issue with dir permission for namespaces 2012-11-26 12:43:32 +02:00
Dmitriy Zaporozhets 585eb70588 Fix http push with namespaces. Allow use of username as login 2012-11-26 11:23:08 +02:00
Riyad Preukschas 79a4ed15ce Change "Get Patch" buttons to dropdowns orffering patches and diffs 2012-11-25 00:36:19 +01:00
Riyad Preukschas 267b18dead Add specs for exporting merge requests as diff or patch 2012-11-25 00:06:53 +01:00
Riyad Preukschas b3834bc9b0 Remove MergeRequest#to_raw and replace it with #to_diff and #to_patch 2012-11-25 00:05:47 +01:00
Riyad Preukschas 2b1afa0e62 Remove merge_request#raw and replace it with formats to #show 
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
 2012-11-25 00:05:44 +01:00
Riyad Preukschas ddb7399ac4 Add specs for exporting commits as diff or patch 2012-11-25 00:05:11 +01:00
Riyad Preukschas 3b7c2adf0a Add diff format to commit#show 2012-11-22 20:49:44 +01:00
Riyad Preukschas 246faa3d7a Add Commit#to_diff for raw diff 2012-11-22 20:49:01 +01:00
Riyad Preukschas 8b4010397c Register diff mime type 2012-11-22 20:22:44 +01:00
Riyad Preukschas 6ddf4567f4 Don't escape Html in patches 
Fixes #2036
 2012-11-22 12:45:39 +01: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 f614ae8ef7 Increased test coverage 2012-11-21 07:14:05 +03:00
Dmitriy Zaporozhets e9be4b375b Cover ProjectMover with tests 2012-11-21 06:18:05 +03:00
Dmitriy Zaporozhets 47234ab367 Validate username. Gitlab::Regex added 2012-11-28 06:14:05 +03:00
Dmitriy Zaporozhets 5ed4e7e216 Revert raphael-rails in order to make network work correctly 2012-11-28 11:45:33 +02:00
Dmitriy Zaporozhets 0bec49ebc1 Merge pull request #2100 from hiroponz/fix_non_utf8_file_encoding 
Fix #2058 diff problem of non ascii paths and non utf-8 file encoding
 2012-11-28 01:39:52 -08:00
satoh 001729bb40 Fix #2058 diff problem of non ascii paths and non utf-8 file encoding 2012-11-28 18:32:06 +09: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