Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets fc953eb162 Improve turbolink spinner
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 21:30:13 +02:00
Dmitriy Zaporozhets 268c183b29 Replace gif animation with font icon spinner
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 20:30:57 +02:00
Dmitriy Zaporozhets 883409b941 Fixed commit align on dashboard feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 19:19:46 +02:00
Dmitriy Zaporozhets ea2a57cd99 Merge branch 'improve/compare_page' into 'master'
Improve Compare page

Prevent Compare page timout for large amount of commits.
Fixes #989
2014-02-05 16:55:36 +00:00
Dmitriy Zaporozhets a1a01254b9 Prevent 500 error on Compare page if diff read timout happens
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 16:21:41 +02:00
Dmitriy Zaporozhets 8f88cbf06b Use MergeRequestDiff::COMMITS_SAFE_SIZE for Compare diff limit.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 16:09:13 +02:00
Dmitriy Zaporozhets 68249f23da Prevent Compare page timout for large amount of commits
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 15:54:51 +02:00
Dmitriy Zaporozhets 55572c4e86 Repository#blob_at_branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 11:39:55 +02:00
Dmitriy Zaporozhets d701d58695 Merge branch 'gitlab_git_rugged' into 'master'
gitlab_git with rugged

Updated gitlab_git version with Blob via rugged
2014-02-05 09:07:47 +00:00
Dmitriy Zaporozhets fc16a228c9 Fix blobs for file services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 09:02:13 +02:00
Takao Baba 208ec627c3 Fix 500 error in Ruby 1.9. 2014-02-05 14:43:20 +09:00
Dmitriy Zaporozhets 31987259e4 Fix markdown renderer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-04 19:14:36 +02:00
Dmitriy Zaporozhets 98fe8fb98d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-04 16:18:40 +02:00
Dmitriy Zaporozhets 3a1c6cccc5 Merge branch 'bug/500_tag_name' into 'master'
Fix 500 on tags page

Fix bug when grit parse tags wrong and raise exception on tags page.
Fixes #993
2014-02-04 14:04:17 +00:00
Dmitriy Zaporozhets 97a4d8aea4 Improve code according to new gitlab_git
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-04 14:46:15 +02:00
Dmitriy Zaporozhets edc18e777c Merge branch 'bug/filtering' into 'master'
Bug in issue and merge request filtering

Fixes #1006
2014-02-03 17:46:34 +00:00
Marin Jankovski 6a87daed76 Filter items by project. 2014-02-03 17:56:31 +01:00
Dmitriy Zaporozhets ca7e4a948b Use new tags/branches from gitlab_git
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-03 18:13:24 +02:00
Takao BabaandTakao Baba c52bc838cd Enable markdown formatting for snippets in projects. 2014-02-04 01:06:21 +09:00
Marin Jankovski 4b0fb02816 Do not load all projects all the time. 2014-02-03 16:02:44 +01:00
brittlewis12 798360194a changed h3, h4 markdown font sizing to match markdown spec -- h3: 1.5em, h4: 1.2em 2014-01-31 11:46:52 -05:00
Marin Jankovski 468c9ce464 Allow issues to be viewed for authenticated user when project is public or internal. 2014-01-31 17:34:09 +01:00
Dmitriy Zaporozhets f416b2f5cf Fix bug with merge request branch select
Merge request target branch select is broken if you submit form and have
some errors on page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-31 13:24:38 +02:00
Dmitriy Zaporozhets d47fb275ce Fix block/remove UI for admin::users#show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-31 13:04:14 +02:00
Jason Hollingsworth 25d93987d4 Fix shifting line numbers. 2014-01-30 19:18:59 -06:00
Dmitriy Zaporozhets 0ee296d1fa Replace pygments with hljs for system hooks help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-30 18:31:24 +02:00
Dmitriy Zaporozhets d5e8fcb312 Fix no-highlight code blocks for dark themes 2014-01-30 14:02:57 +02:00
Dmitriy Zaporozhets 57001c2332 Fix protected branches page UI 2014-01-30 13:49:18 +02:00
Dmitriy Zaporozhets ef735e82f3 Remove shade for reopen button 2014-01-30 13:37:06 +02:00
Dmitriy Zaporozhets 30aae10e05 Use 100% width for note edit form 2014-01-30 13:33:29 +02:00
Dmitriy Zaporozhets 89ab7e79ad Highlight code search results 2014-01-30 13:31:56 +02:00
Dmitriy Zaporozhets 3fafac3efa Remove unnecessary text shadow
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-30 13:20:35 +02:00
Dmitriy Zaporozhets b466217965 Fix note form width
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-30 10:57:52 +02:00
Marin Jankovski 4f3876a2b6 Show images as raw and update the documentation. 2014-01-29 17:28:51 +01:00
Dmitriy Zaporozhets 741db7603c Improve issue box UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-29 17:07:15 +02:00
Andrey Kumanyaev 53bdcb53ae Fix relative links in markdown. Related to #6182 2014-01-29 17:48:59 +04:00
Dmitriy Zaporozhets b75777fd95 no raw data rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-28 11:53:02 +02:00
Dmitriy Zaporozhets fd9a8c3601 Add group avatar to group page. Changed default avatar for group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-28 10:51:18 +02:00
Dmitriy Zaporozhets a184fcf368 Merge pull request #6178 from Popl7/add_group_avatars
added group avatars
2014-01-28 00:26:18 -08:00
Dmitriy Zaporozhets b6454591cc Merge branch 'highlight-js' into 'master'
Highlight.Js

Replace pygments code highlight with client-side library - highlight.js

http://highlightjs.org/
2014-01-28 07:58:59 +00:00
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
Dmitriy Zaporozhets 891ea6f6e6 Improve highlight for notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 18:18:18 +02:00
Dmitriy Zaporozhets f304f975d6 Fix blob multiline highlight
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 14:21:40 +02:00
Dmitriy Zaporozhets 78b2fb5de9 Add highlight.js support to markdown, snippets etc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 13:12:58 +02:00
Dmitriy Zaporozhets 5221dbfee7 Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce 2014-01-27 07:57:36 +00:00
Dmitriy Zaporozhets e322bdbd5e Merge branch 'fix/test' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce 2014-01-27 07:55:30 +00:00
Dmitriy Zaporozhets 3713fc6cdf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-01-27 09:40:56 +02:00
Dmitriy Zaporozhets 1eccec1713 Merge pull request #6158 from Razer6/remove_snippet_expiaration_date
Remove snippet expiration date from UI
2014-01-26 23:37:53 -08:00
Dmitriy Zaporozhets 11ea009ec7 Merge pull request #6159 from dblessing/fix/mobile_ui_dashboard
Mobile UI improvements
2014-01-26 23:37:37 -08:00
Dmitriy Zaporozhets 7986b806a2 Merge pull request #5476 from lyda/logo-white-compress
Reduce image size.
2014-01-26 23:36:18 -08:00