Andrey Vakarev
3bd06d55e0
Remove trailing whitespaces and trailing lines
2012-06-04 01:37:27 +03:00
nathanvda
3792d624b6
Use the faster alternative methods in grit to count tags and branches (which I added). This is much faster in all cases, but especially on large repositories the difference should be obvious.
2012-06-03 03:24:59 +02:00
Dmitriy Zaporozhets
16427f4c40
Merge pull request #880 from NARKOZ/dashboard-feed
...
Dashboard feed
2012-06-01 07:25:54 -07:00
Nihad Abbasov
f8f6ff065e
add projects atom feed
2012-05-31 23:42:02 -07:00
randx
96308f7534
Milestones: progressbar from bootstrap. Bradcrumbs styles
2012-06-01 00:10:52 +03:00
randx
17d4cac208
Rescue encoding error on controller level
2012-05-31 23:36:52 +03:00
randx
a719bfc931
Graph: navigation with keyboard
2012-05-31 23:31:17 +03:00
randx
78f4c789b3
Improved Commit diff -> Images. Red border for removed & green for added images
2012-05-30 21:02:30 +03:00
randx
b826a684c7
Fix MR modal bug
2012-05-30 19:46:09 +03:00
Saito
202807c21a
remove detect_enoding. detect_encoding means force_encoding to the file.data's encoding, not encoding to utf8. will cause encoding problem.
2012-05-30 11:56:00 +08:00
randx
89043d6b89
MR: Accept section polished. Show permission info
2012-05-28 20:19:54 +03:00
randx
d72f8db08a
Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding
...
Conflicts:
lib/gitlab/encode.rb
2012-05-27 12:20:35 +03:00
Gabriel Mazetto
50c2c16a4d
Better algorithm to deal with encodings. Moved fallback rescue message from view to encode library.
...
This helps fix cases where UTF-8 is wrongly identified as ISO-8859-1. We will only try to convert strings if we are 100% sure about the charset, otherwise, we will fallback to UTF-8.
2012-05-26 20:15:06 -03:00
randx
d29ec9d773
Images refactored, Feed icon replaced, Fixed comment form focus
2012-05-27 01:12:28 +03:00
Gabriel Mazetto
39def0dcbb
Better fix for encoding problems on rendering of inline file visualizations like README files.
2012-05-26 15:56:11 -03:00
Dmitriy Zaporozhets
ddc7568fec
Milestone show, Team index: Better UI
2012-05-24 09:23:52 +03:00
Eric
837a78db2e
fix merge_requests.html
2012-05-23 15:20:41 +06:00
Dmitriy Zaporozhets
f33cf247b6
Merge pull request #833 from Nek-/patch-utf8
...
Added force utf8 encoding
2012-05-19 03:34:20 -07:00
Dmitriy Zaporozhets
5d24082787
Preparing to v2.5
2012-05-19 13:17:34 +03:00
Nek
8c7c43b94f
Added force utf8 encoding
2012-05-19 12:12:49 +02:00
Dmitriy Zaporozhets
860e3ab526
Event feed: Icons for some events
2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
1e4d15b406
Password & token split up, icon to button for top panel
2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
02dc256514
Branches pages polished. few css improvements
2012-05-18 00:23:18 +03:00
Dmitriy Zaporozhets
9cd8f7b082
New Feature: Git Blame for file
2012-05-17 19:11:45 +03:00
RickXing
4c503be0f1
fix bug in mailer
2012-05-17 14:30:24 +08:00
Robb Kidd
e660043d22
Make Notify#new_merge_request_email resque friendly.
2012-05-15 22:37:34 -04:00
Robb Kidd
39061af9f8
Make Notify#new_issue_email resque friendly.
2012-05-15 22:37:34 -04:00
Robb Kidd
41c00a20a9
Make Notify#note_wall_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:34 -04:00
Robb Kidd
0a9a2c2a0b
Make Notify#note_commit_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off. Also, the faux SHA1 cannot have underscores or
it will not match the commit pattern defined in the routes.
2012-05-15 22:37:34 -04:00
Robb Kidd
435fd8f087
Make Notify#note_issue_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:34 -04:00
Robb Kidd
bb22360d1a
Make Notify#note_merge_request_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:33 -04:00
Robb Kidd
5fe75649b3
Rename changed_mr_email to reassigned_mr_email & make resque friendly
...
#changed_merge_request_email was really sending emails about merge
request reassignments. Updated method name to reflect that.
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:33 -04:00
Robb Kidd
dd921053c8
Rename changed_issue_email to reassigned_issue_email & make resque friendly
...
#changed_issue_email was really sending emails about issue reassignments.
Updated method name to reflect that.
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:35:53 -04:00
Dmitriy Zaporozhets
be79c9def9
CSS improvements for diff & file view
2012-05-15 19:35:18 +03:00
RickXing
465a195117
show rendered file if it is .markdown file
2012-05-15 09:23:14 +08:00
RickXing
25b80767bd
use resque mailer to send mail background
2012-05-12 17:01:09 +08:00
Adnan Abdulhussein
f20c079375
spelling mistake 'successfull'
2012-05-03 20:35:15 +01:00
Wouter D'Haeseleer
edcbe1178c
Make permission overview structured
...
The current overview is a mess.
This pull commit will make it look more clean.
All permissions are alliged between the columns and the master rights
have been enchanced with all its rights.
2012-05-03 12:44:03 +02:00
Valery Sizov
43dcc9575a
Task #735 Automerge should not be checked on every load of MR show page
2012-04-27 00:53:55 +03:00
Dmitriy Zaporozhets
28cb43135c
Hooks UI improved, Request tests added
2012-04-26 20:43:12 +03:00
Dmitriy Zaporozhets
2746be6ce3
Home button should targeted on root page of context
2012-04-24 21:47:01 +03:00
gitlabhq
c9af8e7579
New project page improved. User profile improved. Show issues, participant on Milestone show page.
2012-04-24 21:49:34 +03:00
gitlabhq
d97a9aa4a4
fixed email markdown
2012-04-23 15:32:56 +03:00
Dmitriy Zaporozhets
71819dc344
logo changed for header
2012-04-22 16:01:59 +03:00
Dmitriy Zaporozhets
08994f3f60
Merge remote-tracking branch 'origin/merge_button'
...
Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
2012-04-21 12:22:56 +03:00
Dmitriy Zaporozhets
7c8fbe8f7f
Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
2012-04-21 01:44:52 +03:00
Dmitriy Zaporozhets
9cb51c6ea2
Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
...
Conflicts:
Gemfile
Gemfile.lock
2012-04-21 01:44:15 +03:00
Dmitriy Zaporozhets
680ee045d8
Merge pull request #709 from blueyed/master
...
Fix typo: "less then" => "less than"
2012-04-20 15:27:53 -07:00
Daniel Hahler
c851639a75
Fix typo: "less then" => "less than".
2012-04-20 23:36:09 +02:00
Arthur Schreiber
5b6019f357
Using github's linguist to better detect filetypes and to do syntax highlighting.
2012-04-20 23:21:12 +02:00
