home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,669 Commits 48 Branches 340 Tags
d8ac75a28f003dcb769b036eff255bef6541fa55
Commit Graph
10669 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets d8ac75a28f Merge branch 'improve-login-page' into 'master' 
Improve login page

* use max-width for brand logo to prevent stretch of small images
* improve default brand logo to be centred on any kind of screen
* hide logo for small screens
* hide text for xs screens
* reduce amount of text on sign-in page

Fixes #1423

See merge request !966
 2014-07-13 19:46:13 +00:00
Dmitriy Zaporozhets 62d2aed036 Improve login page behaviour 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-13 20:56:29 +03:00
Dmitriy Zaporozhets 8da8efb387 Merge branch 'redirect_on_signin' into 'master' 
Redirect on signin

Fixes #1346

See merge request !965
 2014-07-11 19:27:04 +00:00
Marin Jankovski 3b80d68f9d Add in the tests. 2014-07-11 19:53:10 +02:00
Marin Jankovski 07b9d80604 Use devise stored_location to redirect after signing for both public and private pages. 2014-07-11 19:53:10 +02:00
Marin Jankovski 55efb2d9f2 Revert "Merge branch 'redirect_after_login' into 'master'" 
This reverts commit 5aaa35656e, reversing
changes made to 5b8c176767.
 2014-07-11 19:53:10 +02:00
Dmitriy Zaporozhets f3b0cb77fc Make brand image fill 100% width of space 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 17:42:03 +03:00
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 849985a62d Merge branch 'ee-login-layout' into 'master' 
EE login layout

Port login layout from EE

See merge request !964
 2014-07-11 13:48:50 +00: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 a66d6a523b Merge branch 'update-architecture-diagram' into 'master' 
Update architecture diagram

Update the diagram and make clear that rails accesses the repo's via shell.

When done submit to partner.

See merge request !962
 2014-07-11 07:07:01 +00:00
Dmitriy Zaporozhets fa4c7f7690 Merge branch 'escape-before-autolink' into 'master' 
Escape before autolink

Because auto_link set description to html_safe but dont escape html!!! :(

See merge request !963
 2014-07-11 07:03:45 +00:00
Sytse Sijbrandij 6d0bfc922d Updated the picture based on comments. 2014-07-10 23:34:29 +02: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
Sytse Sijbrandij 2df7a7b204 Update the diagram and make clear that rails accesses the repo's via shell. 2014-07-10 18:54:25 +02:00
Dmitriy Zaporozhets 20616c5af5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-07-10 18:51:56 +03:00
Dmitriy Zaporozhets 7a914e5a8f Merge branch 'rework-counters' into 'master' 
Rework counters

* Use one style for counters in sidebar
* show amount of assigned/authored/all entities in sidebar
* fixes UI overflow for small screens

See merge request !961
 2014-07-10 15:51:28 +00: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
Sytse Sijbrandij 0c5ca76dfc Merge pull request #7291 from tbpgr/fix_gitlab_markdown_helper_typo 
Fix gitlab_markdown_helper method header typo. rquest => request.
 2014-07-10 16:10:21 +02: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 a338954c33 Merge branch 'prevent-html-injection' into 'master' 
Prevent html injection

Commits page renders commit description with single_format method which allows html tags. So commit message with html tags brokers Commits page. See screenshot

![Screenshot 2014-07-10 11.16.40](https://dev.gitlab.org/uploads/gitlab/gitlabhq/6606e1bac0/Screenshot_2014-07-10_11.16.40.png)

See merge request !959
 2014-07-10 09:16:48 +00: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 018602b4c8 Merge branch 'fix/notes_reply_click_issue401' into 'master' 
Get Reply button as clicked target in notes.js.coffee

See issue #401

This is a small fix to properly find the reply button as the click target when an element inside the button is clicked (e.g. in this case, the ``<i class="icon-comment">`` element in the button, using the jQuery ``.closest(...)`` function.

Previously, the clicked element was assumed to be the button itself, which caused the comment form to spawn within the button when it was clicked (see the issue for screenshots & other details).
 2014-07-10 07:28:38 +00:00
Marin Jankovski 4a505f38ac Update the tests with milestones descriptions. 2014-07-10 08:46:52 +02: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 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 4024aa8e81 Try to keep token authenticable compatibility 2014-07-09 14:42:25 +02:00
Marin Jankovski 34cfd84ed2 Upgrade to devise 3.2.4 2014-07-09 13:22:32 +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