Commit Graph
10629 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 74f1da10d1 Use linguist from rubygems
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-30 21:31:10 +02:00
Dmitriy Zaporozhets 3975434802 Merge branch 'remove_pygments' into 'master'
Remove Pygments.rb
2014-01-30 19:04:35 +00:00
Dmitriy Zaporozhets c75ab4ec9a Remove python from installation docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-30 19:48:47 +02:00
Dmitriy Zaporozhets d1781d3b11 Get rid of pygments.rb dependency
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-30 19:46:13 +02: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 7f03b32049 Merge pull request #6185 from sag47/doc/archy_overview
An architectural overview of GitLab
2014-01-30 05:16:43 -08:00
Dmitriy Zaporozhets 705521f3e0 Merge branch 'ui_fixes' into 'master'
UI Fixes
2014-01-30 12:53:15 +00: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
Dmitriy Zaporozhets 364bd38d05 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-30 10:56:09 +02:00
Dmitriy Zaporozhets 197a704fc4 Merge branch 'nicer_502' into 'master'
Nicer 502
2014-01-30 08:12:22 +00:00
Jacob Vosmaer 4fdafcaf8a Merge pull request #5842 from vikraman/patch-1
Add comment about tls for ldap method
2014-01-29 10:24:59 -08: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
Marin Jankovski 580db8dea1 Merge pull request #6183 from Undev/fix_links_in_markdown
Fix relative links in markdown. Related to #6182
2014-01-29 06:51:07 -08:00
Sam Gleske d030f62e4b adding ref from structure to architecture 2014-01-29 09:17:58 -05:00
Sam Gleske 2dc4179d7f updating structure doc 2014-01-29 09:17:36 -05:00
Andrey Kumanyaev 53bdcb53ae Fix relative links in markdown. Related to #6182 2014-01-29 17:48:59 +04:00
Sam Gleske 3235d2c342 Clarifying web frontend direct file access
Rewrite how Apache/nginx interacts with precompiled assets.
2014-01-28 22:12:51 -05:00
Sam Gleske 794461c835 update links for gitlab.com 2014-01-28 21:21:15 -05:00
Jurnell Cockhren e2e900a338 In the case when a user can and has authenticated with ldap, however
ldap is disabled in the gitlab config, this fixes the API still calling
the ldap backend.
2014-01-28 15:10:36 -06:00
Sam Gleske 3671984b24 An architectural overview of GitLab
This is to help new admins of GitLab understand what components
are involved in making GitLab work.
2014-01-28 10:10:25 -05: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
Jacob Vosmaer 5de16dee76 Add a custom 502 page 2014-01-28 10:19:22 +01: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
Sytse Sijbrandij 55a662e0c9 Merge branch 'backup_crontab' into 'master'
Backup Crontab
2014-01-28 07:02:10 +00:00
Jacob Vosmaer 5e2ccc671b Add instructions for backups using cron 2014-01-27 18:55:36 +01:00
Dmitriy Zaporozhets 8695ab28e6 Merge pull request #6170 from skv-headless/mr_diffs_psql_broken_migrations
Fix merge_request_diffs migrations for postgresql
2014-01-27 08:25:11 -08:00
Dmitriy Zaporozhets 4413c2325a Merge branch 'stash-pgrade' into 'master'
Document the stash of changes during the upgrade
2014-01-27 16:22:42 +00: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 86e4f6e06d Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 17:36:30 +02:00
Dmitriy Zaporozhets 67faaf6e08 Merge branch 'host-no-scheme' into 'master'
Host No Scheme

People keep adding http in front of the host FQDN, this comment informs them this is not needed.

https://groups.google.com/forum/#!topic/gitlabhq/HPOn51ZcQFs
2014-01-27 15:36:04 +00:00
Dmitriy Zaporozhets 7ce63909da Merge branch 'merge-window' into 'master'
Merge Window
2014-01-27 15:26:18 +00:00
skv-headless 4125de5ef1 Fix merge_request_diffs migrations for postgresql 2014-01-27 18:50:53 +04:00
dosire c62892b225 People keep adding http:// in front of the host. 2014-01-27 14:27:47 +01:00
dosire ac2038b0c9 Detail the merge window. 2014-01-27 14:16:13 +01:00
dosire f591e4a48c Explain stash. 2014-01-27 13:51:01 +01:00
Dmitriy Zaporozhets c3ae30b60e Merge branch 'upload-limits' into 'master'
Upload Limits

Better documentation for the upload limit. Please have a hard time when they need to change the upload limits, see https://gitlab.com/gitlab-org/gitlab-ce/issues/5
2014-01-27 12:44:14 +00: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
dosire 4fc17cf13f Reword the git explanation. 2014-01-27 13:01:20 +01:00
Sytse Sijbrandij 7fc44a27a4 Merge branch 'document_chunked_transfer' into 'master'
Document Chunked Transfer
2014-01-27 11:26:53 +00: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