home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,122 Commits 48 Branches 340 Tags
6a0ea920a5735b25f2dbadd00a5238a73600a5a1
Commit Graph
1277 Commits
Author SHA1 Message Date
jubianchi 7ad93ab250 Improve labels validation and expose error messages 2014-08-20 12:09:19 +02:00
Robert Schilling 938eed1ef8 Consistency: Capitalize hex values of sugested colors 2014-08-15 11:02:05 +02:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api 
Implement complete labels API (create/delete/update)
 2014-08-15 10:25:48 +03:00
Dmitriy Zaporozhets 0602c5d027 Change default label color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-15 10:20:12 +03:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Robert Schilling b9519c8314 Validate label titel in project scope 2014-08-13 15:48:26 +02:00
Robert Schilling c9eaa46c73 Labels need to be valid on name 2014-08-13 15:48:26 +02:00
Robert Schilling a3c969cd92 Add testcase for invalid color 2014-08-13 15:48:26 +02:00
Dmitriy Zaporozhets 82c8c44cac Merge pull request #7312 from hiroponz/fix-404-when-clicking-link-on-hipchat-message 
Fix 404 error when clicking the branch link on hipchat message
 2014-08-13 16:42:31 +03:00
Dmitriy Zaporozhets ffc284301e Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

See merge request !1008
 2014-08-13 13:11:04 +00:00
Robert Schilling cf3ba0209d Update labels via API 2014-08-13 12:29:03 +02:00
Robert Schilling 9284038dbe Add, delete labels via API 2014-08-13 12:28:19 +02:00
Dmitriy Zaporozhets 505203e7d5 Merge pull request #7466 from Razer6/improve_markup_handling 
Improve readme markup,  fixes #7455
 2014-08-11 13:02:24 +03:00
Dmitriy Zaporozhets ddd238eff8 Revert "history for files follows after rename" 
This reverts commit a547356133.
Because grit does not respect offset setting when follow: true which
cause invalid commit history for file
 2014-08-11 13:00:37 +03:00
Robert Schilling d7701a263f Move calls to Gitlab::MarkdownHelper to application_helper 2014-08-11 11:59:36 +02:00
Dmitriy Zaporozhets 42d4ed3a40 Merge pull request #7417 from woita/follow-history-for-files 
history for files follows after rename
 2014-08-11 12:41:00 +03:00
Dmitriy Zaporozhets 04d1128b8a Merge branch 'less-chatty-hipchat-intergation' into 'master' 
Less chatty HipChat intergation

The HipChat integration is noisy. In our team it constantly overwhelms the channel with a lot of commits or the bodies of their messages. It's very easy to loose the actual conversation in the midst of this.

This request does two things:

* Limit the number of shown commits on every push
* Display only the first line (the subject) of each commit messages

We tried it and found it was nicer for us 😄

See merge request !159
 2014-08-11 09:29:40 +00:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Jacob Vosmaer e0fea696c6 Skip LDAP cache check when LDAP is disabled 2014-08-06 18:03:01 +02:00
Walter Kreilinger a547356133 history for files follows after rename 2014-08-02 03:54:39 +02:00
Dmitriy Zaporozhets 2a6fc1c5de Repository#path_to_repo should always return absolute path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 20:12:49 +03:00
Dmitriy Zaporozhets 43d570e0ce Fix 500 error when rename repository. Fixes #1473 2014-07-31 15:39:28 +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 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 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 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 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 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
Stefan Kanev 1cf1e7bedb Less verbose HipChat integration 
Whenever a push with a lot of merges is made, the HipChat channel gets
overwhelmed. It is easy to loose everything else in all the GitLab
messages. It makes more sense to limit the number of commits shown.

The same problem happens with longer commit messages (like this one). It
will be useful to show only the subject of the commit message, not the
full one.
 2014-07-29 11:04:19 +03: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 cb0d63b9e3 Merge pull request #7319 from jvanbaarsen/small-eventcache-refactoring 
Moved some behaviour to one place
 2014-07-26 19:33:18 +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 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 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 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
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
Ciro Santilli 9b5c7a4d60 Add star count, view logic, more tests. 2014-07-17 22:47:16 +02:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
Marin Jankovski 188b6f48d4 Use a better name for token. 2014-07-16 10:01:13 +02: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 45623089e2 Refactor MR build process 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 15:34:06 +03:00
Marin Jankovski 56398ea161 Do not sent a generated password via email for admin created user. 2014-07-15 13:25:11 +02:00