home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,598 Commits 48 Branches 340 Tags
cb4d8eff4cb158fbef4d59bf64e04e776e29eaed
Commit Graph
1220 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d8f4c363d6 Merge pull request #7175 from jvanbaarsen/always-call-hooks 
Call every service, even if one fails
 2014-07-04 17:09:00 +03:00
Marin Jankovski b048c7d24a Do not notify project owner on project creation. 2014-07-03 12:02:31 +02:00
Dmitriy Zaporozhets 8031be73fe Merge branch 'contributors-api' into 'master' 
Contributors api

Fixes #1266

See merge request !934
 2014-07-03 07:28:02 +00:00
Dmitriy Zaporozhets 30b729195b Merge branch 'reference_merge_request_in_commit_message' into 'master' 
Add reference to the merge request in the default merge request commit message

This adds a link to the merge request to the merge request commit.

If merge requests are used for code review, the merge in git is now linked to the code review.

See http://feedback.gitlab.com/forums/176466-general/suggestions/6088000-in-the-default-merge-request-commit-message-add-a
 2014-07-02 16:22:08 +00:00
Dmitriy Zaporozhets 767bd78081 Use Contributor class instead of hash 2014-07-02 15:09:06 +03:00
Dmitriy Zaporozhets 5a88873e5c Move API contributors logic to repository model 2014-07-02 14:43:23 +03:00
Dmitriy Zaporozhets 119b02877d Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master' 
Incorporate Summaries for Notes and Merge Requests Into Dashboard Feed

This MR fixes #305 by adding summaries for notes and merge requests into the dashboard feed.
 2014-07-02 07:00:16 +00:00
Dmitriy Zaporozhets d35a99e6cb Merge pull request #7204 from cirosantilli/user-validation-msg 
Fix username validation message to match regexp.
 2014-07-02 09:57:14 +03:00
Dmitriy Zaporozhets f3b31c4c5b Merge pull request #6629 from sykano/fix-project-limit-for-groups 
fix for project creation: group projects don't count towards user's project limit
 2014-07-02 09:56:24 +03:00
Christian Taedcke c1b7e904ff Add a mention of the merge request into its default commit message. 2014-07-01 21:54:19 +02:00
Dmitriy Zaporozhets 8fb76a8308 Merge branch 'group_milestones' into 'master' 
Group milestones
 2014-07-01 07:18:15 +00:00
Dmitriy Zaporozhets 4f0bfdb500 Merge branch 'strong-parameters' into 'master' 
Strong parameters

Replace protected_attributes with strong parameters.
Fixes #1340
 2014-06-30 17:01:22 +00:00
Marin Jankovski 3e52517da1 Add feature tests for group milestone. 2014-06-30 16:18:26 +02:00
Dmitriy Zaporozhets 4967c08786 Fix signup and project visibility 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-30 16:43:32 +03:00
Marin Jankovski fdbf77ef99 Fix styling issues. 2014-06-30 13:27:17 +02:00
Marin Jankovski d3796b84f8 Show all issues and merge requests that could be considered opened or closed, includes reopened and merged. 2014-06-30 12:41:27 +02:00
Marin Jankovski d145f09cd6 Correct authorization for group milestones. 2014-06-30 11:38:03 +02:00
Marin Jankovski e66a8b4cda Move milestone link in group head, 2 column milestone for MR and issues. 2014-06-30 11:13:24 +02:00
Marin Jankovski c223fb1a96 Start building group milestone show page. 2014-06-30 09:45:16 +02:00
Marin Jankovski f0af302c83 Close and reopen group milestones. 2014-06-30 09:44:30 +02:00
Marin Jankovski 4ca8a175a2 Filter group milestones. 2014-06-30 09:44:30 +02:00
Marin Jankovski 0723bf1afa Move group milestone processing from service to model. 2014-06-30 09:44:30 +02:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Dmitriy Zaporozhets 2acde87e0d Project hook, milestone, snippet strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:51:11 +03:00
Dmitriy Zaporozhets e382c8dfc7 team member and hook strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:45:33 +03:00
Dmitriy Zaporozhets cb74c014ea Key strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 17:00:05 +03:00
Dmitriy Zaporozhets 8f60b5b4fc Group and Event strong_params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 16:57:10 +03:00
Dmitriy Zaporozhets 16a0a4aecc Note strong_params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 16:49:22 +03:00
Dmitriy Zaporozhets 98ba075c32 User model to strong params. Comment other attr_accessible to let tests run 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 15:11:45 +03:00
Jacob Vosmaer b5007c1565 Rename MergeRequest#lock! to #lock_mr! 
As a warning from the StateMachine gem points out to us, there already
exists a method ActiveRecord#lock!. This change renames the `lock` and
`unlock` events defined on MergeRequest to `lock_mr` and `unlock_mr`.
 2014-06-26 14:09:17 +02:00
Dmitriy Zaporozhets 3a21c904dd Use strong params for 5 more models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 15:00:09 +03:00
Dmitriy Zaporozhets 04516027df Project services to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:49:09 +03:00
Ciro Santilli b1c40e8151 Fix username validation message to match regexp. 
Also used for project, group and web ui new file names.
 2014-06-26 13:31:34 +02:00
Dmitriy Zaporozhets 1dab15940d Remove protected_atrributes gem and start moving to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:30:07 +03:00
Dmitriy Zaporozhets af7e77984c Show VERSION information on project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 12:07:06 +03:00
Dmitriy Zaporozhets 907548a0fb dont render discussion diff unless note is for diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 10:14:35 +03:00
Dmitriy Zaporozhets e93f6b030a Improve discussions 
* check for outdated discussions by comparing diff
* improve discussion UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:19:35 +03:00
Dmitriy Zaporozhets 1817b9aec4 Fix namespace selector on Projects#new page 
If user does not own any group he does not see namespace selector when
visit new project page even if he has master membership in one of
groups. This commit fixes it.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 15:12:08 +03:00
Marin Jankovski 4c575b72d5 Move checking of recepients to a service. 2014-06-23 15:44:49 +02:00
Marin Jankovski 185da5f976 Make sure that at mentioning all properly notifies. 2014-06-23 12:28:57 +02:00
Dmitriy Zaporozhets d12b910d20 Merge branch 'remove-observers' into 'master' 
Remove observers from application

Part of #1133
 2014-06-23 06:36:08 +00:00
Jeroen van Baarsen e364a852af Call every service, even if one fails 
When one service fails, we dont want to have all of them failing. This
fixes this problem by catching all the errors, and writing them to the
error log.

Fixes: #5803

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-22 14:48:31 +02:00
Dmitriy Zaporozhets 0771109bb8 Fix permission issue with highest access level for group 
If user was a member of both group and project and group access level
was higher it was not respected and user got lowest project access
level. Now it is fixed and user get highest access level

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-20 12:54:03 +03:00
Dmitriy Zaporozhets 6d352790c4 Fix user notifications 2014-06-17 22:54:21 +03:00
Dmitriy Zaporozhets 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03:00
Dmitriy Zaporozhets a90a201d0e Remove user observer 2014-06-17 22:32:35 +03:00
Dmitriy Zaporozhets 6149dba518 Remove NotesObserver 2014-06-17 22:09:01 +03:00
Dmitriy Zaporozhets 66e068bbdf Fix event creation 2014-06-17 21:45:03 +03:00
Dmitriy Zaporozhets 9e3094b232 Remove UsersGroup observer 2014-06-17 21:36:40 +03:00
Dmitriy Zaporozhets b3a90aba41 Remove ProjectActivityCacheObserver 2014-06-17 21:23:43 +03:00