home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,870 Commits 48 Branches 340 Tags
dab9835ae1cd147cb2a25ec3fb262a3f540b2ca8
Commit Graph
10870 Commits
This Branch
This Branch
All Branches
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 6e69b4eb97 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-07-30 20:15:21 +03:00
Dmitriy Zaporozhets e27a822405 Put some entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 20:14:56 +03:00
Sytse Sijbrandij 1e2e0fefba Merge branch 'release/omnibus' into 'master' 
Add omnibus-gitlab to the monthly release process

See merge request !997
 2014-07-30 16:57:01 +00: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 70f868b737 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 16:05:43 +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 cc33168459 Add indicies to labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 14:25:27 +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 4c8cbf88da Merge branch 'user-new-password' into 'master' 
Require current password even if password was expired

Fixes #1469

See merge request !1002
 2014-07-29 14:10:34 +00: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 535feb08ce Merge branch 'impprove-compare-logic' into 'master' 
Impprove compare logic

* Use single class CompareService for collecting commits and diffs at Compare, MR#new, MR#create pages
* Don't use satellites for compare inside one repo

See merge request !1001
 2014-07-29 12:18:33 +00: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 027fcc0512 Update gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 14:29:36 +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 d30454e112 Override Gitlab::Git::Compare limit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 10:29:12 +03:00
Dmitriy Zaporozhets 06154af09a Merge branch 'satellite_compare_gitlab_git' into 'master' 
Use Gitlab::Git::Compare in Satellite::CompareAction

See merge request !976
 2014-07-29 07:28:15 +00: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 593b6674e1 Merge branch 'federkasten/gitlab-ce-fix-high-cpu-in-ff' 2014-07-28 22:59:29 +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 9f463c9272 Merge pull request #7386 from Razer6/bump_version_number 
Bump version to 7.2.0.pre to avoid backup version mismatches, fixes #7375
 2014-07-28 22:30:08 +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 28151ba51e Merge branch 'log_sidekiq_payloads' into 'master' 
Log sidekiq arguments

See merge request !940
 2014-07-28 18:13:44 +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 03ae6b89bd Log Sidekiq arguments 2014-07-28 16:46:36 +02:00