home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,870 Commits 48 Branches 340 Tags
dab9835ae1cd147cb2a25ec3fb262a3f540b2ca8
Commit Graph
5544 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets dab9835ae1 Use label-branch css for MR branches info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 22:58:20 +03:00
Dmitriy Zaporozhets f0c26bcb64 Fix label set during issue/mr creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 22:48:21 +03:00
Dmitriy Zaporozhets 9c5edce138 Fix issue error message layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 22:48:06 +03:00
Dmitriy Zaporozhets ecbb3ddf21 Correct no-labels message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 19:35:36 +03:00
Dmitriy Zaporozhets 51d2910a74 Add cancel button to labels page form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 19:22:24 +03:00
Dmitriy Zaporozhets 2ecc79507a Order labels by name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 19:13:35 +03:00
Dmitriy Zaporozhets 91c1534e59 Add pagination to labels page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 19:09:24 +03:00
Dmitriy Zaporozhets 86f1f8335f Merge branch 'epic/refactor-labels' into 'master' 
Epic/refactor labels

Part of #1385

See merge request !1003
 2014-07-30 15:02:49 +00:00
Dmitriy Zaporozhets d9d8d3b799 Fix old api compatibility and tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 17:17:29 +03:00
Dmitriy Zaporozhets 593df8e69a Improve labels 
* allow developers to manage labels
* add ability to remove label

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 15:15:39 +03:00
Dmitriy Zaporozhets 6ac26a3cb6 Label views: index, new, edit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 13:27:29 +03:00
Dmitriy Zaporozhets ecabefba19 More strict validation for label title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 13:26:54 +03:00
Dmitriy Zaporozhets 4c6859a2de Prevent duplicates in issue finder when filter by label 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 13:26:23 +03:00
Dmitriy Zaporozhets 048a21974e Add create/update to Labels controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 13:12:11 +03:00
Dmitriy Zaporozhets 81aebaa189 Fix issues label finder 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 12:04:47 +03:00
Dmitriy Zaporozhets 2c32edb3ae Fix 500 for labels page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 22:24:03 +03:00
Dmitriy Zaporozhets b2a6f4e136 Refactor label rendering and default label set generation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 22:19:47 +03:00
Dmitriy Zaporozhets d79c0ea271 Allow set labels from Issue/MR forms 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 21:23:54 +03:00
Dmitriy Zaporozhets d45a6b2941 Migrate issue/mr labels from act_as_taggable to own labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 19:19:26 +03:00
Dmitriy Zaporozhets 6fb9badcae Replace project labels with tags to prevent name conflict with GitLab labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 18:23:18 +03:00
Dmitriy Zaporozhets 03654a6abf Label and LabelLink models for implementing own GitLab labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 17:10:15 +03:00
Dmitriy Zaporozhets 014e6d0f87 Require current password even if password was expired 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 15:28:20 +03:00
Dmitriy Zaporozhets f844556531 Fix email on push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 15:18:11 +03:00
Dmitriy Zaporozhets 2f780af246 Git::Compare does not have limit param any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 14:29:59 +03:00
Dmitriy Zaporozhets 549655765a Fix variable order on compare page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:42:01 +03:00
Dmitriy Zaporozhets 378a3f5ca1 Use CompareService for compare page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:33:51 +03:00
Dmitriy Zaporozhets 098ee55e3c Use CompareService in collecting diff when create MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:21:03 +03:00
Dmitriy Zaporozhets bf9ce1f4cf Refactor compare logic for MR. Use satellites only for forks for better performance 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:11:16 +03:00
Dmitriy Zaporozhets 0768100ad8 Use same color for all selectbox in bulk issue update 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 10:07:47 +03:00
Dmitriy Zaporozhets 8abf010db3 Fix text align for bulk issues update 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 10:02:50 +03:00
Dmitriy Zaporozhets b72ce57da6 Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce into federkasten/gitlab-ce-fix-high-cpu-in-ff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-07-28 22:55:57 +03:00
Dmitriy Zaporozhets 67d5b95dd2 Merge pull request #7383 from Razer6/fix_test_hooks_empty_project 
Do not execute hooks on empty projects, fixes #6108
 2014-07-28 22:30:55 +03:00
Dmitriy Zaporozhets e4c5bf5092 Merge pull request #7387 from Razer6/add_markup_gems 
Improve markup gems to prevent 500 errors
 2014-07-28 22:29:40 +03:00
Dmitriy Zaporozhets f65e967780 Merge branch 'fix-mr-500-error' into 'master' 
Fix MergeRequest#new page

* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit
* fix new file being skipped from diff if it was added in next commit

Fixes #1462

See merge request !998
 2014-07-28 19:27:22 +00:00
Dmitriy Zaporozhets ddaa493ef3 Improve MR building 
* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-28 20:54:40 +03:00
Dmitriy Zaporozhets 746b7e2da8 Merge branch 'only_redirect_to_referer_from_public' into 'master' 
Only redirect to referrer from public GitLab pages

See merge request !995
 2014-07-28 16:37:04 +00:00
Jacob Vosmaer 3a6f9c093e Only redirect to referrer from public GitLab pages 2014-07-28 16:41:37 +02:00
Robert Schilling ceabda743a Improve markup gems 2014-07-28 11:47:27 +02:00
Robert Schilling 062ff17b1c Do not execute hooks on empty projects, fixes #6108 2014-07-27 23:48:53 +02:00
Achilleas Pipinellis 2f78d75c4a Add missing semicolon in application.scss 2014-07-27 09:31:31 +03:00
Dmitriy Zaporozhets cb0d63b9e3 Merge pull request #7319 from jvanbaarsen/small-eventcache-refactoring 
Moved some behaviour to one place
 2014-07-26 19:33:18 +03:00
Dmitriy Zaporozhets d3ea53877d Tests for trending/starred pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-26 10:33:42 +03:00
Jeroen van Baarsen 16eea49277 Moved some behaviour to one place 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-07-25 22:23:42 +02:00
Dmitriy Zaporozhets 974b5a7b2f Most starred projects page for Explore area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-25 22:05:23 +03:00
Dmitriy Zaporozhets 420ba2119b Move star button to sidebar. Add counter to forks too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-24 22:14:12 +03:00
Dmitriy Zaporozhets e21ca9f8b1 Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-07-24 10:54:42 +03:00
Dmitriy Zaporozhets 4a1e98e4b6 Merge pull request #6650 from lloeki/wiki_images_attachments 
Added ability to serve files in wiki repository
 2014-07-23 20:28:03 +03:00
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