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,890 Commits 48 Branches 340 Tags
6a412c99690a6cd4c2467951e4cdb87dfdbf248f
Commit Graph
10890 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Bodenmiller 6a412c9969 add application check commands 2014-08-04 12:56:08 -07:00
Jeroen van Baarsen d4f5af820f Merge pull request #7422 from bbodenmiller/rm-gitlab-user 
Add command to remove GitLab user
 2014-08-04 11:50:30 +02:00
Jeroen van Baarsen ca4ab9efb9 Merge pull request #7424 from bbodenmiller/patch-1 
add command to start rails console
 2014-08-04 10:44:28 +02:00
Jeroen van Baarsen b9feea1301 Merge pull request #7421 from bbodenmiller/self-signed-cert-note 
Self signed SSL cert not supported until 5.1
 2014-08-04 10:43:04 +02:00
Ben Bodenmiller 73bdeff02e add command to start rails console 2014-08-04 00:57:32 -07:00
Ben Bodenmiller 5511bb9f64 Self signed SSL cert not supported until 5.1 2014-08-03 08:42:56 -07:00
Ben Bodenmiller d2ed33224a Remove GitLab user 2014-08-03 08:40:29 -07:00
Jeroen van Baarsen 2600d08f65 Merge pull request #7420 from Razer6/mention_all_markup 
[DOC] Mention the @all GFM reference in documentation
 2014-08-03 12:20:29 +02:00
Sytse Sijbrandij 5084728305 Merge pull request #7419 from Razer6/fix_emoji 
[DOC] Replace invalid emojis
 2014-08-03 12:15:23 +02:00
Robert Schilling 4b022747f4 Mention the @all GFM reference 2014-08-03 11:56:08 +02:00
Robert Schilling dc8e6de062 Replace invalid emojis 2014-08-03 11:44:37 +02:00
Jeroen van Baarsen 4809cbaef0 Merge pull request #7201 from nacengineer/patch-2 
Update 6.9-to-7.0.md
 2014-08-02 12:35:39 +02:00
Jeroen van Baarsen ec18f0bae5 Merge pull request #7410 from robbytaylor/patch-1 
Text changes to projects API documentation
 2014-08-01 08:24:35 +02:00
Jeroen van Baarsen ae646eb11f Merge pull request #7411 from robbytaylor/patch-3 
Fixed typos in Development - Rake Tasks doc
 2014-07-31 21:09:18 +02:00
Rob Taylor 38a692d20b Fixed typos in Development - Rake Tasks doc 2014-07-31 17:55:13 +01:00
Rob Taylor 79d71461c2 Text changes to projects API documentation 
Fixes some grammar / punctuation errors and inconsistencies.
 2014-07-31 17:39:04 +01:00
Dmitriy Zaporozhets 833bc30593 Add test for createing issue with labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 14:14:27 +03:00
Dmitriy Zaporozhets 0f4748873d Project labels tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 14:06:14 +03:00
Dmitriy Zaporozhets 3ed2fce208 Style label-branch color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 23:04:47 +03:00
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