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 c29857ac00 Merge branch 'new_user_password_set' into 'master' 
Admin created user should get password reset link instead of mailed temporary password

Fixes #1405

See merge request !973
 2014-07-23 16:44:07 +00:00
Dmitriy Zaporozhets 945dd627fe Merge pull request #7332 from sugarmo/fix-graph-log-timeout 
Fix timeout error when preparing git graph.
 2014-07-23 19:17:41 +03:00
Dmitriy Zaporozhets 136ff57211 Merge pull request #7340 from cirosantilli/diff-contrast 
[UI] Increase diff byte highlight contrast.
 2014-07-23 19:13:09 +03:00
Dmitriy Zaporozhets ac9b5bc078 Merge branch '7-2-dev' into 'master' 
Explore area

Fixes #1426

See merge request !987
 2014-07-23 16:01:57 +00:00
Dmitriy Zaporozhets f0bfeb6e33 Refactor explore area tests. Replaced old links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 12:18:51 +03:00
Dmitriy Zaporozhets 367445fdcd Refactor explore area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 12:03:49 +03:00
Dmitriy Zaporozhets 667f40d271 Force encoding utf-8 for ruby 1.9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 11:34:28 +03:00
Dmitriy Zaporozhets 1df0345e9e Explore area 
Create one place for exploring GitLab instance projects and groups for
both signed in and anonymous users

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-23 11:13:33 +03:00
Tomas Srna 1072c95180 Attachment URL with non-/ relative root 
The attachment URL was not working with relative_url_root not equal to '/'. I suggest this fix.
 2014-07-22 13:29:41 +02:00
Dmitriy Zaporozhets 6b4d5d21be Merge branch 'public-groups' of https://github.com/innogames/gitlabhq into 7-2-dev 2014-07-22 13:19:45 +03:00
Dmitriy Zaporozhets 98c66b508c Merge branch 'use_fullpath' into 'master' 
If referer in request is incorrect use fullpath

Fixes #1444

See merge request !982
 2014-07-22 06:50:35 +00:00
Marin Jankovski b421750035 Call store_location_for once. 2014-07-22 08:34:16 +02:00
Dmitriy Zaporozhets 2a4c73c0a2 Fix project default branch change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-21 22:47:41 +03:00
Marin Jankovski 9714061bb0 If the referer is not set, use fullpath. 2014-07-21 15:45:27 +02:00
Dmitriy Zaporozhets cfde0936ea Merge branch 'file-upload-bugfix' into 'master' 
Bugfix for Multiple File Upload Dialogs

Fixes issue #426, where a page with multiple dropzones can accidentally trigger multiple file upload dialogs when the user clicks the "selecting them" link.

By specifying the closest "div-dropzone-wrapper" before sending a click to "div-dropzone", duplicate events are prevented from firing.

See merge request !153
 2014-07-21 10:36:24 +00:00
Dmitriy Zaporozhets 72f50fcb2c Merge branch 'fix/avatar_relative_url' into 'master' 
Fix Avatar and Relative URL

Fixes https://github.com/gitlabhq/gitlabhq/issues/7270

Instead of `URI::join` use a simple join with a slash. This is how all other places in GitLab join URLs and it doesn't muck with the relative path.

See merge request !144
 2014-07-21 10:34:41 +00:00
Ciro Santilli a02ff56b4d Increase diff byte highlight contrast. 2014-07-21 12:25:26 +02:00
Steven Mok 69dc5461c3 Fix timeout error when preparing git graph. 2014-07-18 23:03:23 +08:00
Hiroyuki Sato a10f5fadb5 Fix 404 error when clicking the branch link on hipchat message 2014-07-18 20:20:18 +09:00
GitLab 824821b4e9 Fixing an issue where pages with multiple dropzones can trigger multiple file upload dialogs under certain conditions. 2014-07-17 21:33:21 +00:00
Ciro Santilli 1591467655 Helper instead of template. 2014-07-17 22:47:17 +02:00
Ciro Santilli 0a6e978db7 Fix hound. 2014-07-17 22:47:17 +02:00
Ciro Santilli 9b5c7a4d60 Add star count, view logic, more tests. 2014-07-17 22:47:16 +02:00
Ciro Santilli ecd771ccdf Move coffee to assets/project 2014-07-17 22:47:16 +02:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
Marin Jankovski c0a95947bc Update the note for admin user. 2014-07-17 14:03:17 +02:00
Dmitriy Zaporozhets de582ab375 Fix user params when edit from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 15:12:33 +03:00
Marin Jankovski 188b6f48d4 Use a better name for token. 2014-07-16 10:01:13 +02:00
Marin Jankovski 8968f6d874 Update specs. 2014-07-16 09:51:20 +02:00
Dmitriy Zaporozhets 9879c427ce If MR commits are empty if does not mean compare failed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 23:04:14 +03:00
Dmitriy Zaporozhets 2d6c4d2bb0 Merge branch 'fix-huge-mr' into 'master' 
Fix huge merge requests

* Refactored suppress logic for diffs
* Increase grit memory limit (should mix most of 502 errors when create MR)
* show first 100 files for huge diffs

Fixes #1424

See merge request !970
 2014-07-15 17:28:03 +00:00
Dmitriy Zaporozhets be5b6db883 Refactor diff suppress logic and diff views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 18:28:21 +03:00
Dmitriy Zaporozhets 3dc347a369 Cleanup diff stats UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 16:05:56 +03:00
Dmitriy Zaporozhets 45623089e2 Refactor MR build process 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 15:34:06 +03:00
Marin Jankovski 44b8198334 Do not set password expiry. 2014-07-15 14:30:05 +02:00
Marin Jankovski 56398ea161 Do not sent a generated password via email for admin created user. 2014-07-15 13:25:11 +02:00
Marin Jankovski dcc6302c85 Show milestone state on group milestone show page. 2014-07-15 11:59:37 +02:00
Gregoire Daussin cc6edc416e Fix milestones description's max length 2014-07-15 09:34:05 +02:00
dreis 1da2262efd Added public groups area to enhance searching and exploring of projects 
fixed whitespaces and quotes

fixed whitespaces

fixed devise.html.haml

fixed method parenthesis in app/models/group.rb

removed links from header

removed links from devise.html

added tests
 2014-07-15 08:19:27 +02:00
Marin Jankovski 275a5281d5 Milestone is closed only if all milestones are closed. 2014-07-14 15:25:09 +02:00
Dmitriy Zaporozhets d9bc57d18e Merge branch 'branches_with_no_parent' into 'master' 
Branches with no parent cannot be merged

Solves `undefined method 'reduce' for false:FalseClass`

Fixes #1415

See merge request !967
 2014-07-14 11:51:58 +00:00
Dmitriy Zaporozhets 2099aa38b6 Merge pull request #7131 from skv-headless/per_request_rules_caching 
per request project rules caching
 2014-07-14 13:58:53 +03:00
Marin Jankovski 7435b879a6 Error message needs to be correct. 2014-07-14 12:11:01 +02:00
Marin Jankovski 207bc8a0e7 Branches without parent commit cannot be merged. 2014-07-14 11:06:14 +02:00
Dmitriy Zaporozhets 25c9bf4b6a Restore blue color for sign-in button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-14 10:02:46 +03:00
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
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