home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 0f80ffdf87 Use heading instead of strong and line breaks in description. 2014-07-10 08:37:51 +02:00
Marin Jankovski d4e7db4082 Add milestone descriptions on the group show page. 2014-07-10 08:36:28 +02:00
Dmitriy Zaporozhets 1f3261ac41 More entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-09 19:13:31 +03:00
Dmitriy Zaporozhets c337a27824 Merge branch 'browse_file' into 'master' 
Browse file

Fixes #1335

See merge request !951
 2014-07-09 15:13:00 +00:00
Dmitriy Zaporozhets 70848097a4 Merge branch 'active_highlight' into 'master' 
Active highlight

This will highlight active page regardless of the action we use.

See merge request !957
 2014-07-09 15:11:34 +00:00
Marin Jankovski d6067296de Active link based on controller rather than action. 2014-07-09 11:38:29 +02:00
Marin Jankovski 91e01275cb Add tests to check for correct browse link name. 2014-07-09 10:12:09 +02:00
Marin Jankovski 6b121aa5a7 Move the links decision to helper. 2014-07-09 10:12:09 +02:00
Marin Jankovski 5d25f3d9b1 Differentiate between dirs, files and general code. 2014-07-09 10:12:08 +02:00
Marin Jankovski de22913501 Check if blob is requested. 2014-07-09 10:12:08 +02:00
Marin Jankovski 4e0afce6a7 Show browse file if we are browsing file history. 2014-07-09 10:12:08 +02:00
Dmitriy Zaporozhets 47d5ef4bd5 Merge branch 'update-highlight-js' into 'master' 
Update highlight.js to 8.1

Pack version including all supported languages. Yay for Haml, Clojure, Go and Erlang support!

Fixes #1411.

See merge request !956
 2014-07-09 07:40:24 +00:00
Dmitriy Zaporozhets 437cccf9a9 Update highlight.js to 8.1 
Also added support for less common languages. All languages from
http://highlightjs.org/download/ now supported

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-09 09:47:06 +03:00
Dmitriy Zaporozhets 22995fc932 Merge branch 'redirect_betwee_tree_and_blob' into 'master' 
Redirect between tree and blob

This checks if on requested non-existing tree path blob exists, redirects to blob path if the file exists, otherwise return not found.

See #1369

See merge request !953
 2014-07-09 06:19:18 +00:00
Marin Jankovski e87f238077 Add tests for redirects. 2014-07-08 20:25:25 +02:00
Dmitriy Zaporozhets 4c3785afbf Merge branch 'fix-path-regex' into 'master' 
Fix path regex

Fixes #1208

See merge request !955
 2014-07-08 16:49:03 +00:00
Dmitriy Zaporozhets 6a0cb25096 Dont allow ? in project path 
Because it causes 500 error on every page where link to such project
exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 18:15:23 +03:00
Dmitriy Zaporozhets ac1ff491b4 Merge branch 'fix-archive-corrupt' into 'master' 
Fix archive corruption

* When I click download I trigger archive creation
* We don't use tmp storage for uncompleted archive
* When I refresh a page - archiving still in progress but file already exists - I get corrupted (unfinished) file
* If I wait for few more seconds and click download - I get correct file because archiving operation finished and file is valid

This MR fixes issue by bumping `gitlab_git` to newer version. In this version archive created in tmp file and becomes available only when archive operation finished.

Fixes #1394

See merge request !954
 2014-07-08 14:25:59 +00:00
Dmitriy Zaporozhets d51294b99f Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 15:48:25 +03:00
Dmitriy Zaporozhets 593e262e40 Fix 500 on repo archive download 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 14:55:20 +03:00
Dmitriy Zaporozhets 85a15b0e22 Merge pull request #7152 from bhuisgen/master 
Fix LDAP TLS authentication
 2014-07-08 09:44:29 +03:00
Dmitriy Zaporozhets 7bd9a702e3 Merge pull request #7222 from jhund/fix-5936 
Don't remove trailing newline when editing a file in web UI editor
 2014-07-08 09:43:23 +03:00
Dmitriy Zaporozhets 715b8181ef Merge pull request #7273 from whitesheep/patch-1 
gitlab-shell
 2014-07-08 09:42:09 +03:00
Marco Rondini e97834567b gitlab-shell 
version change
 2014-07-07 21:32:46 +02:00
Dmitriy Zaporozhets 3cb99017c7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-07 17:07:27 +03:00
Dmitriy Zaporozhets 664112b47e Merge branch 'improve-email-threading' into 'master' 
Improve email threading

This is a follow-up to !112 : it improves email threading, without changing the receiver of the emails.

* Subject of answers to an existing thread begins with `Re: ` (required by Mail.app)
* Send a 'In-Reply-To' header along the 'References' header
 2014-07-07 14:06:40 +00:00
Marin Jankovski 005752e4c6 Check if blob or tree and redirect to the correct one. 2014-07-07 15:46:57 +02:00
Dmitriy Zaporozhets 5a67d482af Merge branch 'sanitize_rake_check_output' into 'master' 
Sanitize rake check output

Fixes #1206

See merge request !952
 2014-07-07 13:33:11 +00:00
Marin Jankovski cb4d8eff4c Add sanitize option to documentation. 2014-07-07 14:41:02 +02:00
Marin Jankovski 553f3aba48 Remove duplicated calls. 2014-07-07 14:19:32 +02:00
Marin Jankovski 4c68d2387e Add sanitize option to gitlab check rake task. 2014-07-07 14:12:06 +02:00
Dmitriy Zaporozhets d5a8f9ccca Merge branch 'cleaner-help-page' into 'master' 
Cleaner help page

Focus on documentation. Move quick help section to right. Remove unnecessary styling

See merge request !950
 2014-07-05 08:16:07 +00:00
Dmitriy Zaporozhets a5379ef9f7 Cleaner help page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 10:24:57 +03:00
Dmitriy Zaporozhets fe2cb593f9 Improve markdown doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 08:52:43 +03:00
Dmitriy Zaporozhets 5bb2840dc4 Merge branch 'notification_when_reopened' into 'master' 
Notification when reopened issue or mr

Fixes #1396

See merge request !939
 2014-07-05 05:40:32 +00:00
Dmitriy Zaporozhets 6947d3c0ba Truncate header title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 02:03:33 +03:00
Dmitriy Zaporozhets 87eda15b7b Merge branch 'email-service-full-commit-message' into 'master' 
Show full commit message and author name for Email on push service

Fixed #1305

![Screenshot 2014-07-04 17.42.47](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/55696faea6/Screenshot_2014-07-04_17.42.47.png)

See merge request !949
 2014-07-04 19:22:01 +00:00
Dmitriy Zaporozhets 6a6803c2f9 Show full commit message and author name for Email on push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 17:42:11 +03:00
Dmitriy Zaporozhets c8ac0ab392 Merge pull request #7208 from MrMarvin/ce_rake_cleanup_ldap_users 
Adds rake task to clean up deleted LDAP users
 2014-07-04 17:10:06 +03:00
Dmitriy Zaporozhets d8f4c363d6 Merge pull request #7175 from jvanbaarsen/always-call-hooks 
Call every service, even if one fails
 2014-07-04 17:09:00 +03:00
Dmitriy Zaporozhets d3fcb60e43 Merge branch 'flash_message_after_signup' into 'master' 
Flash message after signup

Fixes #1366

See merge request !948
 2014-07-04 14:00:41 +00:00
Dmitriy Zaporozhets 078a4a7c4e Merge branch 'improve-ci-widget-ui' into 'master' 
Improve ci widget ui

See merge request !943
 2014-07-04 13:21:24 +00:00
Dmitriy Zaporozhets bd165421a8 Merge branch 'fix-fork-branch-removal' into 'master' 
Don't show remove branch checkbox for MR from fork

Fixes #1359

See merge request !942
 2014-07-04 13:20:59 +00:00
Dmitriy Zaporozhets 00455a478b Merge branch 'group_milestones_improvements' into 'master' 
Group milestones improvements

Fixes #1400

Fixes #1401

Fixes #1402

See merge request !946
 2014-07-04 13:20:41 +00:00
Dmitriy Zaporozhets 7aa8bfc1c7 Merge branch 'correct_active_link' into 'master' 
Correct active link for group milestones

Fixes #1399

See merge request !945
 2014-07-04 13:19:38 +00:00
Marin Jankovski 87f89bc970 Redirect to sign in page after signup, this will show the correct flash message. 2014-07-04 14:19:59 +02:00
Sytse Sijbrandij 1b76554125 Merge branch 'fix_for_public_access_doc' into 'master' 
Fix for public access doc

See merge request !947
 2014-07-04 11:28:00 +00:00
Marin Jankovski ddb8c8e0d6 Link to permissions doc using relative path. 2014-07-04 13:15:36 +02:00
Marin Jankovski 3b5722bca9 Improve performance, ordering and pagination for group milestones. 2014-07-04 11:57:24 +02:00
Marin Jankovski cb69e76a29 Use correct controller name, namespacing ignored. 2014-07-04 10:49:36 +02:00