home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +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 248b12833c Add bottom links for sign-in page so I can get to Public area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 17:37:20 +03:00
Dmitriy Zaporozhets 8c15fd0014 Rename brand helper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 17:16:44 +03:00
Dmitriy Zaporozhets 5c51e4835e Small fixes for sign-in page text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 16:42:09 +03:00
Dmitriy Zaporozhets ba5787c38a Less distracting git clone line for public page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 16:39:04 +03:00
Dmitriy Zaporozhets 6d332ce146 Improve signin/signup/reset pages UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 16:05:57 +03:00
Dmitriy Zaporozhets f4fbc7b92b Add box shadow to login box 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 15:14:48 +03:00
Dmitriy Zaporozhets 853ce95423 Improve login page for small screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 15:10:57 +03:00
Dmitriy Zaporozhets ce30172cef Fix brand logo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 15:10:41 +03:00
Dmitriy Zaporozhets b93c1a562c Use same login layout between CE and EE versions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 15:05:40 +03:00
Dmitriy Zaporozhets 1218a5e630 Add html_escape to project description. auto_link set description to html_safe but! dont escape html :(. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 00:07:20 +03:00
Dmitriy Zaporozhets a019b49a2b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-07-10 23:31:10 +03:00
Dmitriy Zaporozhets 6bc32fe4fd Merge branch 'upgrade_devise' into 'master' 
Upgrade devise from 3.0.4 to 3.2.4

See merge request !960
 2014-07-10 20:26:22 +00:00
Marin Jankovski 60cc1d8e92 Override strong params for sign up. 2014-07-10 19:31:05 +02:00
Dmitriy Zaporozhets 20616c5af5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-07-10 18:51:56 +03:00
Dmitriy Zaporozhets cff1758486 Show counters in sidebar filter in same way like we did for projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-10 17:54:31 +03:00
tbpgr e1535eff95 Fix gitlab_markdown_helper method header typo. rquest => request. 2014-07-10 21:59:01 +09:00
Marin Jankovski 108be8a666 Update to accomodate devise deprecations and backward incompatible changes. 2014-07-10 13:56:35 +02:00
Marin Jankovski 1e3fce1a82 Check for the correct param for token. 2014-07-10 13:10:37 +02:00
Dmitriy Zaporozhets 53a8d50b2b Prevent html injection on commits page by commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-10 11:09:00 +03:00
Dmitriy Zaporozhets 4fb5a39dc0 Merge branch 'group_milestones_description' into 'master' 
Group milestones description

Fixes #1403

See merge request !958
 2014-07-10 07:44:16 +00:00
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
Ali Tavakoli 0b1cf50060 Added .closest() to find Reply button on click; fixes #401 
This is to fix the issue where the icon-comment icon is clicked in the
Reply button of a note; the icon is used as the target and incorrectly
assumed to be the button itself, which causes the reply form to spawn
inside the button.
 2014-07-09 18:16:24 -04: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
Marin Jankovski 4024aa8e81 Try to keep token authenticable compatibility 2014-07-09 14:42:25 +02: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 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
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 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
Drew Blessing fe1553e943 Don't use URI join 2014-07-07 16:25:05 -05: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 a5379ef9f7 Cleaner help page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 10:24:57 +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 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 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
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
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