home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,642 Commits 48 Branches 340 Tags
v7.3.1
Commit Graph
1301 Commits
Author SHA1 Message Date
Dmitriy ZaporozhetsandMarin Jankovski 8ccae3c385 Fix MR commenting system when new commits pushed 
This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.

Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`
 2014-09-23 17:12:36 +02:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
Drew Blessing 09cdd94322 Fix serialize migration. Fixes #7734 2014-09-11 18:41:03 -05:00
Jan-Willem van der Meer bf0de1a500 Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring 2014-09-11 11:46:08 +02:00
Dmitriy Zaporozhets 6135eb0adf Merge pull request #7705 from dblessing/serialize_service_properties 
Serialize service properties
 2014-09-10 20:47:47 +03:00
Drew Blessing a0dbcd2365 Serialize services properties 2014-09-10 09:56:39 -05:00
Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' 
Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066
 2014-09-09 13:57:50 +00:00
Dmitriy Zaporozhets 9e4a40982e Merge pull request #7646 from bushong1/snippet-search3 
Adding in snippet search functionality
 2014-09-09 10:31:21 +03:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03:00
Dmitriy Zaporozhets f42a1ded99 Merge pull request #7696 from Zyphrax/master 
Prevent graph spacing issue
 2014-09-07 09:49:48 +03:00
Yvo van Beek 1f355279d2 Remove parent spacing. Fixes #7505 2014-09-06 19:51:28 +10:00
Dmitriy Zaporozhets fd6b7b4a30 Pluralize commit text for note when push to existing MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 17:27:53 +03:00
Dmitriy Zaporozhets b0b05aa28d Add comment to merge request when new push happens 
It allows track when user added new commits to existing merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 16:56:36 +03:00
Sean Edge 468b2e8e0b Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG. 2014-09-04 09:47:20 -04:00
jubianchiandjubianchi 0ac4a933ff Filters issues by labels via API 2014-09-04 14:41:31 +02:00
Jan-Willem van der Meer 62fc80642d Refactor Oauth::User class to use instance methods 2014-09-03 15:59:50 +02:00
Lukas Erlacher 40fc4261f2 Add system hook for ssh key changes 
Add system hook for ssh key create and destroy
Update and fix documentation
Update tests
 2014-09-03 01:27:02 +02:00
Charles Bushong 4cca1b050a Adding in snippet search functionality 
http://feedback.gitlab.com/forums/176466-general/suggestions/5529795-search-though-snippets
 2014-08-29 15:32:07 -04:00
Dmitriy Zaporozhets 01520d5d77 Dont allow edit or remove of system notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 15:19:35 +03:00
Dmitriy Zaporozhets 8b00d01c67 Search by issue/mr title and description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:47:30 +03:00
Dmitriy Zaporozhets 5d9a5c02d8 Add search method to Note class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 23:39:37 +03:00
Dmitriy Zaporozhets 92deb451da Annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:25:02 +03:00
Christian Sarazin 4a14b5900b Added AsciiDoc support and changed to singlequotes 
extension to https://github.com/gitlabhq/gitlabhq/pull/7568
 2014-08-22 12:33:58 +02:00
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