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,847 Commits 48 Branches 340 Tags
2c32edb3aeb3abd4eae12a51b071629da5ab30ff
Commit Graph
10847 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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 2e55eac215 7.2 started 2014-07-28 10:24:49 +02:00
Robert Schilling 062ff17b1c Do not execute hooks on empty projects, fixes #6108 2014-07-27 23:48:53 +02:00
Dmitriy Zaporozhets 00c6723883 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-27 21:38:19 +03:00
Dmitriy Zaporozhets c77315dc50 Merge branch 'fix_typo_application_scss' into 'master' 
Add missing semicolon in application.scss

Was toying to import some custom css and found out about this :)

See merge request !157
 2014-07-27 18:36:37 +00:00
Sytse Sijbrandij 3c420ae17b Merge branch 'test_regex_with_rubular' into 'master' 
Add a tip on how to test regular expressions

See merge request !994
 2014-07-27 16:06:42 +00:00
Sytse Sijbrandij 7da74468b3 Merge branch 'add-merge-moments-to-process' into 'master' 
Add merge moments to process

Fixes #1450

See merge request !986
 2014-07-27 15:32:26 +00: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 8734a9cde8 Merge branch 'most-starred' into 'master' 
Most starred projects page

Fixes #1461

See merge request !996
 2014-07-26 13:51:54 +00: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 76af5a1db7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-25 20:40:23 +03:00
Jacob Vosmaer e03ab14f78 Add a tip on how to test regular expressions 2014-07-25 18:26:04 +02:00
Dmitriy Zaporozhets 5a89b61028 Merge branch 'exim-problems' into 'master' 
Exim problems

After merge report back to https://github.com/gitlabhq/gitlabhq/issues/4866

See merge request !990
 2014-07-25 15:11:47 +00:00
Dmitriy Zaporozhets 42632de3fb Merge branch 'project-services-explained' into 'master' 
Project services explained

See merge request !993
 2014-07-25 15:10:58 +00:00
Sytse Sijbrandij 83b40ba268 Explain project services. 2014-07-25 13:47:11 +02:00
Jacob Vosmaer e0cdb8a361 Merge branch 'backup-settings-warning' into 'master' 
Backup settings warning

Fixes #1457

See merge request !992
 2014-07-25 09:49:24 +00:00
Sytse Sijbrandij ead2dc0c21 Add warning about backing up the config. 2014-07-25 11:12:17 +02:00
Sytse Sijbrandij 1a2a193135 Merge branch 'word-requirement-a-bit-more-realistic' into 'master' 
Word requirement a bit more realistic

See commit message

See merge request !155
 2014-07-25 08:57:56 +00:00