Commit graph

3990 commits

Author SHA1 Message Date
Riyad Preukschas 167f26b90d Add an ordering scope to Wiki 2013-01-11 20:04:14 +01:00
Riyad Preukschas 5aada8cc2a Move wiki delete button to the edit page 2013-01-11 20:03:43 +01:00
Riyad Preukschas e54246d310 Merge pull request #2561 from MrHammy/master
Fix to pages links
2013-01-11 10:20:23 -08:00
Riyad Preukschas f0c4e94d74 Move checks after init script installation in docs 2013-01-11 18:59:06 +01:00
David Southard 97a4e1b86a update grammar in check application status section 2013-01-11 17:23:35 +01:00
MrHammy c913f40ca4 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
2013-01-11 13:40:29 +01:00
Dmitriy Zaporozhets 32dadb46fa Merge pull request #2555 from studiofrenetic/master
Fix for archive download (method path missing)
2013-01-10 13:02:15 -08:00
Martin Bastien f97ae2ff85 Fix for archive download (method path missing) 2013-01-10 15:55:34 -05:00
Dmitriy Zaporozhets 9152ab7955 Fix missing image for last push 2013-01-10 20:20:56 +02:00
Dmitriy Zaporozhets 0bd3c195a5 Merge branch 'improve/wiki_typography' of dev.gitlabhq.com:gitlab/gitlabhq 2013-01-10 16:59:36 +00:00
Dmitriy Zaporozhets 37771eb4cc Merge branch 'bug/pager_load' of dev.gitlabhq.com:gitlab/gitlabhq 2013-01-10 16:59:27 +00:00
Dmitriy Zaporozhets eadad85561 Merge branch 'improve/filter_icons' of dev.gitlabhq.com:gitlab/gitlabhq 2013-01-10 16:59:12 +00:00
Dmitriy Zaporozhets 50b172530c Merge branch 'improve/admin' of dev.gitlabhq.com:gitlab/gitlabhq 2013-01-10 16:59:01 +00:00
Dmitriy Zaporozhets e25656d09b Improve wiki typography 2013-01-10 18:09:12 +02:00
Dmitriy Zaporozhets dd20da1bff Fix pager loading on every page in application 2013-01-10 17:38:37 +02:00
Dmitriy Zaporozhets abc2bdc3aa Remove unused images. More use of font-awesome icons 2013-01-10 08:43:25 +02:00
Dmitriy Zaporozhets c2982c9a31 sidekiq.log in admin area. Improved admin dashboard 2013-01-10 08:43:25 +02:00
Dmitriy Zaporozhets 78698698dc Merge pull request #2539 from jameswritescode/remove_passenger_fix
remove passenger_fix
2013-01-09 22:35:10 -08:00
James Newton 2b38c8a156 remove passenger_fix.rb, which due to the recent removal of Resque in favor of sidekiq breaks gitlab in passenger 2013-01-09 22:17:03 -06:00
Cyril 8a3bbbdb88 clean app helper
* remove unused method
* simplify gravatar_icon
2013-01-10 01:46:23 +01:00
Riyad Preukschas 7cd03836e5 Fix sidekiq check task 2013-01-10 00:09:09 +01:00
Riyad Preukschas 4eac403e3b Fix sidekiq task to use Rails 2013-01-10 00:09:09 +01:00
Dmitriy Zaporozhets 6ea7bc27e4 Merge pull request #2533 from gliptak/master
Use ruby 1.9.3-p327 on travis-ci
2013-01-09 14:33:18 -08:00
Dmitriy Zaporozhets aca0caa8cc Merge pull request #2534 from AlexDenisov/ajax_activities
Reload activities/events on the dashboard page via ajax
2013-01-09 13:26:54 -08:00
Alex Denisov d7bc121474 replace javascript:void with preventDefault 2013-01-09 21:02:41 +00:00
gliptak e47104bd7a Use ruby 1.9.3-p327 on travis-ci 2013-01-09 14:43:49 -05:00
Alex Denisov 5133fe8efb dashboard js -> coffee 2013-01-09 19:30:20 +00:00
Alex Denisov 3cc0458312 Reloading of events via ajax instead of page reloading. 2013-01-09 19:30:20 +00:00
AlexDenisov 0d9f73fa1e JavaScript removed from dashboard#index template. 2013-01-09 19:30:20 +00:00
Alex Denisov f038057b9d Typo fixed 2013-01-09 19:30:20 +00:00
Alex Denisov 97d17cf835 Event filters stores at cookies. 2013-01-09 19:30:20 +00:00
Alex Denisov b255c3c44b Tests on events filtering added 2013-01-09 19:30:20 +00:00
Alex Denisov 2b93201533 Tests on EventFilters added 2013-01-09 19:30:19 +00:00
Riyad Preukschas d27cc91ee9 Merge pull request #2527 from VonC/gitignore
Update .gitignore
2013-01-09 10:34:13 -08:00
Dmitriy Zaporozhets 6869a56403 Fix sidekiq chech and added script/check 2013-01-09 20:31:05 +02:00
Dmitriy Zaporozhets 16b61590ab Spinach: admin logs, admin users 2013-01-09 19:38:27 +02:00
VonC 3aa5daf696 gitignore updates.
Most yml files are ignored in gitlab/config/, except resque.yml
=> add it to the list of ignored files.
2013-01-09 16:39:43 +00:00
Dmitriy Zaporozhets 66ecfa77e5 Merge branch 'sidekiq' 2013-01-09 18:21:49 +02:00
Dmitriy Zaporozhets ab344f31b6 Rails upto 3.2.11 2013-01-09 11:07:55 +02:00
Dmitriy Zaporozhets 0d5c6a48be Merge pull request #2484 from netdata/fix_url_encode
Fixing request.fullpath URL encoding
2013-01-09 00:35:32 -08:00
Dmitriy Zaporozhets 31e3dc600a Fix routing specs 2013-01-09 09:47:25 +02:00
Dmitriy Zaporozhets 80e79f33af Merge pull request #2516 from jouve/fix_json_exemples_in_help
fix exemple js data in help/web_hook
2013-01-08 23:43:43 -08:00
Dmitriy Zaporozhets aa97ff7fde Fixed tree logs for branches with slash. Fixed remember of path when switch branch 2013-01-09 09:34:26 +02:00
Dmitriy Zaporozhets 7bfd38eaa9 spinach test: project services 2013-01-09 09:14:05 +03:00
Dmitriy Zaporozhets 9b22f41e54 set undefined features 2013-01-09 12:04:55 +02:00
Dmitriy Zaporozhets 9773ccc451 sidekiq with green tests 2013-01-09 09:14:05 +03:00
Dmitriy Zaporozhets 71bd956866 email via sidekiq. start and stop rake tasks 2013-01-09 08:44:05 +03:00
Dmitriy Zaporozhets 2f6603e581 A bit of spinach tests 2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets c7bb3a1f72 sidekiq 2013-01-09 08:14:05 +03:00
Cyril 0a0d2ecf85 fix exemple js data in help/web_hook 2013-01-08 15:34:15 +01:00