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
Arthur Schreiber
c437e2d7d4
Switch to Redcarpet for Markdown Rendering.
...
This gives us Github Flavored Markdown, which is awesome.
2012-04-20 23:01:45 +02:00
Dmitriy Zaporozhets
9ee345750c
fixed admin root path for header
2012-04-20 22:51:57 +03:00
randx
35e21b3402
Admin dashboard
2012-04-20 19:41:49 +03:00
randx
1d601616a3
Pagination and better perfomance for projects page.
2012-04-20 19:11:49 +03:00
Ricky Elrod
3f1a004c47
Fix a few grammatical mistakes in profile view.
2012-04-19 08:01:58 -03:00
Tiago Ribeiro
8b5ef3c24f
Fixed typo in label
2012-04-18 02:34:14 +01:00
Dmitriy Zaporozhets
5ef3b38429
MR commits suppressed if too many. few icons
2012-04-17 22:08:07 +03:00
Dmitriy Zaporozhets
3b7998e197
Milestone filter for issues improved
2012-04-17 21:03:01 +03:00
Dmitriy Zaporozhets
ac7bb20682
fixed app crash on new issue via get
2012-04-17 20:35:27 +03:00
Dmitriy Zaporozhets
3250a024ef
1. Improved admin -> new project form
...
2. Fixed bug: post-receive file was not added when create project via admin
2012-04-17 20:27:18 +03:00
Dmitriy Zaporozhets
f1795a4911
Issues form improved, Show milestone for Issue show
2012-04-17 00:22:59 +03:00
Dmitriy Zaporozhets
c9def945d4
User blocking improved. Admin area styled
2012-04-16 23:33:03 +03:00
Valery Sizov
a8e4f3ed88
Auto-merge: 'already can not be merged' alert
2012-04-16 23:05:08 +03:00
Valery Sizov
8269a3a735
Auto-merge: checking via AJAX
2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets
c0df0cd70c
Commit header improved. finalize PR 667
2012-04-16 01:10:09 +03:00
Dmitriy Zaporozhets
a7ed8276d7
Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-nicer_commit_headers
2012-04-15 21:01:35 +03:00
Arthur Schreiber
ad25dac8b6
Change the design a bit to look more like before.
2012-04-14 12:38:12 +02:00
Arthur Schreiber
c530543c1a
Nicer commit headers.
2012-04-14 12:38:12 +02:00
Dmitriy Zaporozhets
95fde9bd7a
Projects page as dashboard. Old dashboard removed
2012-04-14 11:20:45 +03:00
Dmitriy Zaporozhets
5f31989a05
Search improved
2012-04-14 11:16:11 +03:00
randx
497ee5fbbc
Ability to block user
2012-04-13 08:12:34 +03:00
Dmitriy Zaporozhets
fb6d4511a0
restored dark theme
2012-04-12 00:54:07 +03:00
Dmitriy Zaporozhets
0e62b1cbaa
preserve for code browse
2012-04-11 23:59:53 +03:00
Dmitriy Zaporozhets
088860de4e
feed few fixes
2012-04-11 23:50:13 +03:00
Dmitriy Zaporozhets
740e54c3fc
Merge pull request #667 from keikubo/master
...
The indents errors of pre blocks in haml
2012-04-11 13:34:15 -07:00
Dmitriy Zaporozhets
e7add858cf
bug fixes & bootstrap buttons
2012-04-11 23:32:45 +03:00
Dmitriy Zaporozhets
b7558a2063
Removed encoding monkey patch
2012-04-11 23:03:56 +03:00
Kei Kubo
42f04bf70c
bug fix: broken indents fixed in markdown rendered statements
2012-04-11 19:36:52 +00:00
Kei Kubo
700eec6672
added = preserve to some pre statements
2012-04-11 19:13:38 +00:00
Kei Kubo
51ca0abf10
bug fix: <pre> indent error fixed in projects/empty.html
2012-04-11 10:35:49 -07:00
Dmitriy Zaporozhets
ba3c359fd5
b2 fixes
2012-04-10 21:39:04 +03:00
Dmitriy Zaporozhets
8f22834c4e
bootstrap 2 integration complete.
2012-04-10 20:50:27 +03:00
Dmitriy Zaporozhets
2587de74df
Minor fixes
2012-04-10 20:06:17 +03:00
randx
627efddf63
migrated to bootstrap 2
2012-04-10 08:51:08 +03:00
Dmitriy Zaporozhets
d98b183361
first pack of tests for milestones
2012-04-09 01:01:42 +03:00
Dmitriy Zaporozhets
23d950855d
Milestone basic scaffold
2012-04-09 00:28:58 +03:00
Dmitriy Zaporozhets
667edcdd75
Dashboard issues/mr pages improved
2012-04-08 00:18:32 +03:00
Dmitriy Zaporozhets
88974b500f
projects list on dashboard with commit links
2012-04-07 23:13:18 +03:00
Andrea Dal Ponte
f30d56494e
admin_user_path correction
2012-04-06 12:00:13 +02:00
Dmitriy Zaporozhets
86676476e6
Handling big commits & big diff
2012-04-06 01:00:15 +03:00
randx
897da534fa
Fix issues with push 600+ commits. refactored, improved push events
2012-04-04 07:39:04 +03:00
Dmitriy Zaporozhets
a951e6f8ae
GitlabSerialize: cause of invalid yaml in some events we migrate to json serialization
2012-04-04 02:25:33 +03:00
Dmitriy Zaporozhets
8aa5076d68
pollished team index
2012-04-04 01:21:31 +03:00
Dmitriy Zaporozhets
c40c627a3b
team profile restyled
2012-04-02 21:13:44 +03:00
Dmitriy Zaporozhets
c9db6bb3f2
prevent app crash for events without git resources
2012-04-02 19:51:20 +03:00
Dmitriy Zaporozhets
00dc34e192
Events improved & refactored. Dashboard pollished
2012-04-02 00:24:45 +03:00
Dmitriy Zaporozhets
90748cf724
Merge Button v1 complete
2012-03-30 20:49:34 +03:00
Staicu Ionut
2b01c65e50
- when you add a new ssh key, the title field automatically fills with the email (if is present in the key sting)
2012-03-30 18:30:56 +03:00
randx
3824f9b372
Unverify MR on every push. Ajax for MR accept. better UI
2012-03-30 08:15:04 +03:00
randx
411d84f385
Better merge handling. show if MR can be accepted or not
2012-03-30 08:05:04 +03:00
Dmitriy Zaporozhets
cd74f9da91
Link for auto merge, db field for MR
2012-03-30 00:27:42 +03:00
randx
69ef81404c
UI improved, .main_box css class for show pages
2012-03-28 10:46:51 +03:00
Dmitriy Zaporozhets
bae4efa7cf
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
2012-03-28 00:31:22 +03:00
Dmitriy Zaporozhets
46906ca9db
Issues, Merge Request show page polished. Fixed +n overflow
2012-03-28 00:31:14 +03:00
Valery Sizov
442d5dbef2
fixed yellow background in markdown documents
2012-03-27 23:04:21 +03:00
Dmitriy Zaporozhets
1647f46b1f
Project show page polished
2012-03-26 23:11:15 +03:00
Dmitriy Zaporozhets
788de6f1c8
Better commit show page
2012-03-26 22:41:56 +03:00
Dmitriy Zaporozhets
7d56a51bdc
Js refactoring and ajax animation replaced
2012-03-26 21:41:58 +03:00
