OSDN Git Service
Dmitriy Zaporozhets [Tue, 15 Jan 2013 09:12:17 +0000 (11:12 +0200)]
change logic on line_code
Riyad Preukschas [Mon, 14 Jan 2013 23:53:00 +0000 (00:53 +0100)]
Merge branch 'master' into discussions
Riyad Preukschas [Mon, 14 Jan 2013 23:11:35 +0000 (00:11 +0100)]
Replace commit diff note request specs with spinach features
Riyad Preukschas [Mon, 14 Jan 2013 22:55:02 +0000 (23:55 +0100)]
Replace commit note request specs with spinach features
Riyad Preukschas [Mon, 14 Jan 2013 23:52:25 +0000 (00:52 +0100)]
Merge commit 'master' into discussions
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
Riyad Preukschas [Mon, 14 Jan 2013 23:27:59 +0000 (00:27 +0100)]
Add preliminary specs for notes on merge requests
Riyad Preukschas [Mon, 14 Jan 2013 23:27:26 +0000 (00:27 +0100)]
Smaller fixes
Riyad Preukschas [Mon, 14 Jan 2013 21:21:26 +0000 (13:21 -0800)]
Merge pull request #2585 from timl/patch-1
Fix typo in installation guide.
Dmitriy Zaporozhets [Mon, 14 Jan 2013 18:55:57 +0000 (20:55 +0200)]
line numbers for blame
Dmitriy Zaporozhets [Mon, 14 Jan 2013 18:21:04 +0000 (20:21 +0200)]
remove thin from production env. Use unicorn for foreman
Dmitriy Zaporozhets [Mon, 14 Jan 2013 18:13:02 +0000 (10:13 -0800)]
Merge pull request #2584 from jasl8r/public-grack-clone
Public HTTP clones and remove auth request for public projects
Tim Laszlo [Mon, 14 Jan 2013 15:28:33 +0000 (09:28 -0600)]
Update doc/install/installation.md
Change "th" to "the"
Jeremy Slater [Mon, 14 Jan 2013 14:46:55 +0000 (09:46 -0500)]
Public HTTP clones and remove auth request for public projects
Dmitriy Zaporozhets [Mon, 14 Jan 2013 11:39:09 +0000 (13:39 +0200)]
CHANGELOG for 4.1
Dmitriy Zaporozhets [Mon, 14 Jan 2013 08:09:01 +0000 (10:09 +0200)]
Dont set @project variable in list. Remove a bit of duplication in dash and group
Dmitriy Zaporozhets [Mon, 14 Jan 2013 07:44:27 +0000 (09:44 +0200)]
profjects filter with_push to project model
Dmitriy Zaporozhets [Mon, 14 Jan 2013 07:37:29 +0000 (09:37 +0200)]
Few more filters for admin / projects
Dmitriy Zaporozhets [Sun, 13 Jan 2013 15:24:29 +0000 (17:24 +0200)]
Add public filter to admin projects
Dmitriy Zaporozhets [Sat, 12 Jan 2013 19:54:52 +0000 (21:54 +0200)]
fix unauth for public
Dmitriy Zaporozhets [Thu, 10 Jan 2013 18:17:57 +0000 (20:17 +0200)]
Public git read-only access via http
Riyad Preukschas [Fri, 11 Jan 2013 23:44:40 +0000 (00:44 +0100)]
Replace all stat command line calls with ruby equivalents
Riyad Preukschas [Fri, 11 Jan 2013 21:25:18 +0000 (22:25 +0100)]
Make method names clearer in check.rake
Riyad Preukschas [Sat, 12 Jan 2013 00:24:51 +0000 (01:24 +0100)]
Move OS detection to task helpers and add detection of OS X
Riyad Preukschas [Fri, 11 Jan 2013 20:04:21 +0000 (21:04 +0100)]
Update empty error messages and warn if not viewing the most recent wiki page
Riyad Preukschas [Fri, 11 Jan 2013 19:20:11 +0000 (20:20 +0100)]
Update wiki pages
* Properly name columns in Pages and History views
* Link to Authors
* Make views more consistent
Riyad Preukschas [Fri, 11 Jan 2013 19:16:37 +0000 (20:16 +0100)]
Fix link_to_member to not be bold by default
Riyad Preukschas [Fri, 11 Jan 2013 19:04:14 +0000 (20:04 +0100)]
Add an ordering scope to Wiki
Riyad Preukschas [Fri, 11 Jan 2013 19:03:43 +0000 (20:03 +0100)]
Move wiki delete button to the edit page
Riyad Preukschas [Fri, 11 Jan 2013 18:20:23 +0000 (10:20 -0800)]
Merge pull request #2561 from MrHammy/master
Fix to pages links
Riyad Preukschas [Fri, 11 Jan 2013 17:58:13 +0000 (18:58 +0100)]
Move checks after init script installation in docs
David Southard [Thu, 10 Jan 2013 19:21:54 +0000 (13:21 -0600)]
update grammar in check application status section
MrHammy [Fri, 11 Jan 2013 12:40:29 +0000 (13:40 +0100)]
Update app/views/wikis/pages.html.haml
Changed the link in the pages of the wiki to the direct link instead of the first created page
Dmitriy Zaporozhets [Thu, 10 Jan 2013 21:02:15 +0000 (13:02 -0800)]
Merge pull request #2555 from studiofrenetic/master
Fix for archive download (method path missing)
Martin Bastien [Thu, 10 Jan 2013 20:55:34 +0000 (15:55 -0500)]
Fix for archive download (method path missing)
Dmitriy Zaporozhets [Thu, 10 Jan 2013 18:20:56 +0000 (20:20 +0200)]
Fix missing image for last push
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:59:36 +0000 (16:59 +0000)]
Merge branch 'improve/wiki_typography' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:59:27 +0000 (16:59 +0000)]
Merge branch 'bug/pager_load' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:59:12 +0000 (16:59 +0000)]
Merge branch 'improve/filter_icons' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:59:01 +0000 (16:59 +0000)]
Merge branch 'improve/admin' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:09:12 +0000 (18:09 +0200)]
Improve wiki typography
Dmitriy Zaporozhets [Thu, 10 Jan 2013 15:38:37 +0000 (17:38 +0200)]
Fix pager loading on every page in application
Dmitriy Zaporozhets [Thu, 10 Jan 2013 06:43:25 +0000 (08:43 +0200)]
Remove unused images. More use of font-awesome icons
Dmitriy Zaporozhets [Thu, 10 Jan 2013 06:43:25 +0000 (08:43 +0200)]
sidekiq.log in admin area. Improved admin dashboard
Dmitriy Zaporozhets [Thu, 10 Jan 2013 06:35:10 +0000 (22:35 -0800)]
Merge pull request #2539 from jameswritescode/remove_passenger_fix
remove passenger_fix
James Newton [Thu, 10 Jan 2013 04:17:03 +0000 (22:17 -0600)]
remove passenger_fix.rb, which due to the recent removal of Resque in favor of sidekiq breaks gitlab in passenger
Riyad Preukschas [Wed, 9 Jan 2013 23:08:15 +0000 (00:08 +0100)]
Fix sidekiq check task
Riyad Preukschas [Wed, 9 Jan 2013 22:56:47 +0000 (23:56 +0100)]
Fix sidekiq task to use Rails
Dmitriy Zaporozhets [Wed, 9 Jan 2013 22:33:18 +0000 (14:33 -0800)]
Merge pull request #2533 from gliptak/master
Use ruby 1.9.3-p327 on travis-ci
Dmitriy Zaporozhets [Wed, 9 Jan 2013 21:26:54 +0000 (13:26 -0800)]
Merge pull request #2534 from AlexDenisov/ajax_activities
Reload activities/events on the dashboard page via ajax
Alex Denisov [Wed, 9 Jan 2013 21:02:41 +0000 (21:02 +0000)]
replace javascript:void with preventDefault
gliptak [Wed, 9 Jan 2013 19:43:49 +0000 (14:43 -0500)]
Use ruby 1.9.3-p327 on travis-ci
Alex Denisov [Wed, 9 Jan 2013 19:28:31 +0000 (19:28 +0000)]
dashboard js -> coffee
Alex Denisov [Wed, 9 Jan 2013 18:14:24 +0000 (18:14 +0000)]
Reloading of events via ajax instead of page reloading.
AlexDenisov [Wed, 9 Jan 2013 05:58:27 +0000 (05:58 +0000)]
JavaScript removed from dashboard#index template.
Alex Denisov [Mon, 3 Dec 2012 05:09:05 +0000 (07:09 +0200)]
Typo fixed
Alex Denisov [Mon, 3 Dec 2012 00:29:07 +0000 (02:29 +0200)]
Event filters stores at cookies.
Alex Denisov [Sun, 2 Dec 2012 20:54:19 +0000 (22:54 +0200)]
Tests on events filtering added
Alex Denisov [Sun, 2 Dec 2012 20:18:03 +0000 (22:18 +0200)]
Tests on EventFilters added
Riyad Preukschas [Wed, 9 Jan 2013 18:34:13 +0000 (10:34 -0800)]
Merge pull request #2527 from VonC/gitignore
Update .gitignore
Dmitriy Zaporozhets [Wed, 9 Jan 2013 18:31:05 +0000 (20:31 +0200)]
Fix sidekiq chech and added script/check
Dmitriy Zaporozhets [Wed, 9 Jan 2013 17:38:27 +0000 (19:38 +0200)]
Spinach: admin logs, admin users
VonC [Wed, 9 Jan 2013 09:04:41 +0000 (09:04 +0000)]
gitignore updates.
Most yml files are ignored in gitlab/config/, except resque.yml
=> add it to the list of ignored files.
Dmitriy Zaporozhets [Wed, 9 Jan 2013 16:21:49 +0000 (18:21 +0200)]
Merge branch 'sidekiq'
Dmitriy Zaporozhets [Wed, 9 Jan 2013 09:07:55 +0000 (11:07 +0200)]
Rails upto 3.2.11
Dmitriy Zaporozhets [Wed, 9 Jan 2013 08:35:32 +0000 (00:35 -0800)]
Merge pull request #2484 from netdata/fix_url_encode
Fixing request.fullpath URL encoding
Dmitriy Zaporozhets [Wed, 9 Jan 2013 07:47:25 +0000 (09:47 +0200)]
Fix routing specs
Dmitriy Zaporozhets [Wed, 9 Jan 2013 07:43:43 +0000 (23:43 -0800)]
Merge pull request #2516 from jouve/fix_json_exemples_in_help
fix exemple js data in help/web_hook
Dmitriy Zaporozhets [Wed, 9 Jan 2013 07:34:26 +0000 (09:34 +0200)]
Fixed tree logs for branches with slash. Fixed remember of path when switch branch
Dmitriy Zaporozhets [Wed, 9 Jan 2013 06:14:05 +0000 (09:14 +0300)]
spinach test: project services
Dmitriy Zaporozhets [Wed, 9 Jan 2013 10:04:55 +0000 (12:04 +0200)]
set undefined features
Dmitriy Zaporozhets [Wed, 9 Jan 2013 06:14:05 +0000 (09:14 +0300)]
sidekiq with green tests
Dmitriy Zaporozhets [Wed, 9 Jan 2013 05:44:05 +0000 (08:44 +0300)]
email via sidekiq. start and stop rake tasks
Dmitriy Zaporozhets [Wed, 9 Jan 2013 05:14:05 +0000 (08:14 +0300)]
A bit of spinach tests
Dmitriy Zaporozhets [Wed, 9 Jan 2013 05:14:05 +0000 (08:14 +0300)]
sidekiq
Cyril [Tue, 8 Jan 2013 14:34:15 +0000 (15:34 +0100)]
fix exemple js data in help/web_hook
Dmitriy Zaporozhets [Tue, 8 Jan 2013 10:23:33 +0000 (12:23 +0200)]
Fix minor style issue for compare
Dmitriy Zaporozhets [Tue, 8 Jan 2013 05:14:05 +0000 (08:14 +0300)]
a bit of restyling for issues and merge request lists
Dmitriy Zaporozhets [Mon, 7 Jan 2013 20:22:35 +0000 (22:22 +0200)]
organize simplecov
Riyad Preukschas [Mon, 7 Jan 2013 20:18:41 +0000 (21:18 +0100)]
Fix checking for the recommended Gitolite version
Fixes #2475
Riyad Preukschas [Mon, 7 Jan 2013 18:47:53 +0000 (19:47 +0100)]
Fix check for outdated config file
Riyad Preukschas [Mon, 7 Jan 2013 18:39:15 +0000 (19:39 +0100)]
Add a check whether repos_path is a symlink
Riyad Preukschas [Mon, 7 Jan 2013 18:19:50 +0000 (19:19 +0100)]
Fix bug in OS detection in check task
Riyad Preukschas [Mon, 7 Jan 2013 18:04:20 +0000 (19:04 +0100)]
Fix accessing the project repository path in check task
Fixes #2496
Dmitriy Zaporozhets [Mon, 7 Jan 2013 20:05:21 +0000 (22:05 +0200)]
Fix group test after ajax activity
Dmitriy Zaporozhets [Mon, 7 Jan 2013 18:48:57 +0000 (20:48 +0200)]
Common filtering for dashboard and group. Share partial search result partial
Riyad Preukschas [Mon, 7 Jan 2013 18:15:27 +0000 (10:15 -0800)]
Merge pull request #2504 from mitchty/sles_changes
Update info.rake to be able to run successfully on SuSE.
Riyad Preukschas [Mon, 7 Jan 2013 17:41:27 +0000 (09:41 -0800)]
Merge pull request #2485 from gliptak/patch-2
Renaming check function from 1056 to 1059
Mitch Tishmack [Mon, 7 Jan 2013 17:07:11 +0000 (11:07 -0600)]
Update info.rake to be able to run successfully on SuSE.
Dmitriy Zaporozhets [Mon, 7 Jan 2013 15:36:24 +0000 (17:36 +0200)]
Validate username uniq in scope of namespace
Dmitriy Zaporozhets [Mon, 7 Jan 2013 12:44:57 +0000 (14:44 +0200)]
Fixed tests
Dmitriy Zaporozhets [Mon, 7 Jan 2013 12:36:01 +0000 (14:36 +0200)]
Speedup dashboard via loading events with ajax
Dmitriy Zaporozhets [Mon, 7 Jan 2013 12:08:03 +0000 (14:08 +0200)]
Improve milestone show page
Dmitriy Zaporozhets [Mon, 7 Jan 2013 09:32:12 +0000 (11:32 +0200)]
Fix xss vulnerability
Dmitriy Zaporozhets [Sat, 5 Jan 2013 22:30:38 +0000 (00:30 +0200)]
Added cleanup to help rake
Dmitriy Zaporozhets [Sat, 5 Jan 2013 22:08:02 +0000 (00:08 +0200)]
Green button when we create new item, blue when save or some primary action
Riyad Preukschas [Sat, 5 Jan 2013 21:58:36 +0000 (22:58 +0100)]
Add specs for notes on wall
Riyad Preukschas [Sat, 5 Jan 2013 21:58:27 +0000 (22:58 +0100)]
Add specs for notes on commits
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:49:01 +0000 (23:49 +0200)]
Fix network test and snippets expired
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:36:04 +0000 (23:36 +0200)]
Add RAILS_ENV to rake docs
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:29:48 +0000 (23:29 +0200)]
Fix backup/restore path_to_repo