home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ffee5bb090 Improve themes. Load highlight.js properly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-26 22:00:23 +02:00
Dmitriy Zaporozhets 76be57fcf2 Init highlgiht js and render for blob. Improve css for it 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-26 21:34:22 +02:00
Dmitriy Zaporozhets b95a56c181 Modify white and solarized themes for hljs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-26 21:33:32 +02:00
Dmitriy Zaporozhets c7966a426b Include highlight.js assets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-26 21:33:04 +02:00
Sytse Sijbrandij 05eb618548 Merge branch 'hipchat-remove-hash' of /mnt/ebs/repositories/Tenzer/gitlab-ce 2014-01-26 15:22:13 +00:00
Drew Blessing 8b3b6f1096 Mobile UI improvements for dashboard/nav 
Style navbar toggle button

Style navbar toggle manually instead of with button classes

Style navbar

Modify color

Turn off all tooltips for touch devices

Style main nav

Fix scrolling navbar collapse

Style tweaks

Minor tweaks

Style no ssh key message
 2014-01-25 10:07:39 -06:00
Robert Schilling 05c38ab8e0 Remove snippet expiration date from UI 2014-01-25 09:04:33 +01:00
Jason Hollingsworth 39a2adf4f4 Fix broken test in spec/models/project_spec.rb 
A test was broken if running on a non-standard port.
Made checking for (non-)standard port more robust.
Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
 2014-01-24 21:14:05 -06:00
Jason Hollingsworth 71c157e43b Add files to path blacklist. 
Remove empty ErrorsController
 2014-01-24 20:06:44 -06:00
Dmitriy Zaporozhets ced4a37a18 Merge branch 'reference_relative_links' into 'master' 
Reference style links with relative links in markdown

#996

```
Adds relative links support to reference style links, eg:

[GitLab API doc directory][GitLab API directory listing]

[Maintenance][Maintenance rake task]

\[GitLab API directory listing]: doc/api/
\[Maintenance rake task]: doc/raketasks/maintenance.md
```
 2014-01-24 22:01:57 +00:00
Dmitriy Zaporozhets 237ddd6024 Improve authorization for new/edit blob pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 21:29:52 +02:00
Dmitriy Zaporozhets 4645f464a3 Allow developers to mange issue tracker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 21:29:22 +02:00
Marin Jankovski 54bcb6cc2a Merge branch 'master' into reference_relative_links 
Conflicts:
	spec/models/project_spec.rb
 2014-01-24 14:02:11 +01:00
Dmitriy Zaporozhets 1338c7dd71 Fix mr update issue if merge_request_diff missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 14:38:02 +02:00
Dmitriy Zaporozhets 48f741eed9 MergeRequests services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 14:18:32 +02:00
Dmitriy Zaporozhets d0b87eb05b Merge branch 'ssh-docs' into 'master' 
Ssh Docs
 2014-01-24 11:26:47 +00:00
Carlos Paramio b373158077 Project name was hardcoded (oops) 2014-01-24 08:42:24 +01:00
Dmitriy Zaporozhets 6d3a92f225 Merge pull request #6131 from dblessing/fix/mobile_ui_login 
Enhance responsive UI for the login screen.
 2014-01-23 04:58:39 -08:00
Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
 2014-01-23 14:38:23 +02:00
dosire f909739f39 Split into one sentence per line for future edits. 2014-01-23 13:28:19 +01:00
dosire a91faf4022 Better ssh key docs. 2014-01-23 12:07:21 +01:00
Dmitriy Zaporozhets 380342784d Fix MR spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 12:55:43 +02:00
Dmitriy Zaporozhets ccae561f9b Fix selectbox when submit MR from fork to origin 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 10:08:26 +02:00
Dmitriy Zaporozhets 69ff7657d7 Fix HELP layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 09:23:58 +02:00
Drew Blessing 7c3a705365 Enhance responsive UI for the login screen. 2014-01-22 20:01:02 -06:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets 4b3afe2325 Always create merge_request_diff if MR created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 20:22:20 +02:00
Marin Jankovski 16ba8fa077 Display correct paths in markdown for reference style links. 2014-01-22 15:07:29 +01:00
Dmitriy Zaporozhets 51ea42e238 Improve commit render performnace for MR show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:54:53 +02:00
Dmitriy Zaporozhets 39a86963e9 Set mr_diff state to collected if diff is ok 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:30:14 +02:00
Dmitriy Zaporozhets 193a5ed3c3 Render MR diff correctly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:20:40 +02:00
Dmitriy Zaporozhets 79bfbe5918 Remove commits/diff store login from MergeRequest model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:20:20 +02:00
Dmitriy Zaporozhets d9be420ee6 MergeRequestDiff model responsoible for storing commits/diff info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:19:02 +02:00
Dmitriy Zaporozhets 5f9d90e218 Merge pull request #5958 from brunoga/go-repository-fetch 
Added support for Go's repository retrieval.
 2014-01-21 02:27:21 -08:00
Dmitriy Zaporozhets b04d6c2e61 Merge pull request #6098 from jeromedalbert/master 
Rename "Website url" labels to "Website"
 2014-01-20 06:43:23 -08:00
Dmitriy Zaporozhets 4e890e5baa Merge branch 'fix/selectbox_above' into 'master' 
Fix select2 css for drop above style less than a minute ago
 2014-01-20 14:27:38 +00:00
Dmitriy Zaporozhets 66d0db2e23 Merge branch 'bug/500_pagination' into 'master' 
Fix 500 error on project issues and merge requests pages
 2014-01-20 14:13:12 +00:00
Dmitriy Zaporozhets bb0f723741 Fix select2 css for drop above style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-20 15:41:18 +02:00
Jerome Dalbert 9697e5327f Rename "Website url" labels to "Website" 2014-01-20 13:05:19 +00:00
Dmitriy Zaporozhets a0e3893d1b Fix assign-to-me link for MR form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-20 14:23:06 +02:00
Dmitriy Zaporozhets e583df5443 Dont override project_id params when use issues/mr filtering 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-20 14:16:12 +02:00
Bruno Albuquerque fb782476f9 Change web_url_without scheme to web_url_without_protocol. 2014-01-20 06:26:34 -05:00
Bruno Albuquerque b75401d591 Move Go specific meta tag after the atom feed code. 2014-01-20 05:45:17 -05:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets 3628eb84c4 Merge pull request #6072 from jvanbaarsen/fix-3516 
Better check on the validity of emails
 2014-01-19 10:29:06 -08:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-01-19 20:23:29 +02:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Peter Golm 427520ac53 use the iid to generate the link_to_merge_request_diff_line_note instead of id 2014-01-18 19:11:42 +01:00
Dmitriy Zaporozhets 712a2ec4fd Case-insensetive search autocomplete for projets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 16:22:57 +02:00
Dmitriy Zaporozhets 757e92d52e Prevent duplicate method names in helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 16:06:20 +02:00