Commit Graph
4791 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 860f159d41 Add note when MR assignee changes. Add more tests to MR services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 18:16:05 +03:00
Dmitriy Zaporozhets 8cc5e85543 Mention protected branch force push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 17:06:11 +03:00
Dmitriy Zaporozhets 1eec1f4f20 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-03 12:56:09 +03:00
Dmitriy Zaporozhets a7ab029d22 Merge branch 'reduce-observers' into 'master'
Remove some observers
2014-04-03 09:55:46 +00:00
Dmitriy Zaporozhets 9b6224f99c More test fixes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 12:05:21 +03:00
Dmitriy Zaporozhets 76c4421b26 Merge pull request #6639 from yatish27/ConsistentJSFormat
Consistent format for class objects in javascript
2014-04-03 11:36:44 +03:00
Dmitriy Zaporozhets 9b598fa62d Fix MR fork validation and services load
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 10:36:10 +03:00
Marin Jankovski 7ab46b969f Do not require modernizr. 2014-04-03 08:49:34 +02:00
Dmitriy Zaporozhets 9ee697dd68 Use MergeRequest services in API and controllers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:51:53 +03:00
Dmitriy Zaporozhets 3c867dfa8e MergeRequest services for create, update, close and reopen
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:51:17 +03:00
Dmitriy Zaporozhets 65cd9829ee Remove MergeRequest observer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:35:59 +03:00
Dmitriy Zaporozhets 6ae2529041 Remove KeysObserver
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:13:05 +03:00
Dmitriy Zaporozhets 599344583b Remove EmailsObserver
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:02:02 +03:00
Dmitriy Zaporozhets 3faa14e7a7 Merge branch 'reduce-observers' into 'master'
Move issue create/update code to services

Reduce observers role in GitLab code
2014-04-02 17:54:27 +00:00
Dmitriy Zaporozhets 49f977d675 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 19:55:23 +03:00
Dmitriy Zaporozhets 2ab53dfb1c Merge branch 'issue_search_filter' into 'master'
Fix reset of issue search on submit
2014-04-02 15:30:13 +00:00
Dmitriy Zaporozhets ea347323c9 Merge branch 'fix-jquery-assets' into 'master'
Replace custom jquery css with native one.

Fixes wrong assets path for calendar in production
2014-04-02 14:04:36 +00:00
Dmitriy Zaporozhets 1b5fb4ac21 Fix assignee change in Issues::UpdateService
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 16:08:49 +03:00
Dmitriy Zaporozhets ed67ba9663 Add support for close/reopen actions in update service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 15:50:50 +03:00
Dmitriy Zaporozhets cc77365488 Create services for issue close and reopen
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 15:38:24 +03:00
Dmitriy Zaporozhets 0d41f6f0a3 Remove issue observer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 15:37:57 +03:00
Dmitriy Zaporozhets f38eddc69e Replace custom jquery css with native one. Fixes wrong assets path for calendar in production
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 14:57:00 +03:00
Dmitriy Zaporozhets 09d24a1f67 Better title suggestion for new MR
Ex. if branch named "refactor-models" then title will be "Refactor models"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 14:16:37 +03:00
Dmitriy Zaporozhets c4e81ed9de Move update issue code to separate service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 13:54:41 +03:00
Dmitriy Zaporozhets cfd9fd30d6 Move code for issue creation to service.
The goal of suych refactoring is to get rid of observers.
Its much easier to test and code when object creation and all other
related actions done in one class instead of splited across observers,
callbacks etc.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 13:38:35 +03:00
Marin Jankovski b06f43288a Pass the required parameters on search submit. 2014-04-02 12:26:09 +02:00
Marin Jankovski 109ab1a58b Add comments, fix style, better names for notification methods. 2014-04-01 17:18:52 +02:00
Marin Jankovski 528a641e9e Use group notification settings while honoring project settings. 2014-04-01 17:18:52 +02:00
Marin Jankovski ce30a56f33 Add or remove watchers from list based on their notification settings. 2014-04-01 17:18:52 +02:00
Dmitriy Zaporozhets 95b84e2c5a Move branch creation logic in service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-01 10:33:23 +03:00
Dmitriy Zaporozhets 2ab2d60b9e Merge pull request #6660 from robertboloc/patch-1
Grammar correction: "View in Gitlab"
2014-03-31 15:55:07 +03:00
Robert Boloc dd32c9f0ed Updated notification message 2014-03-31 12:24:55 +02:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00
Robert Boloc 3055331965 Grammar correction: "View in Gitlab"
Changed to "View on Gitlab"
2014-03-31 12:05:41 +02:00
Dmitriy Zaporozhets 0488e34ba7 Merge branch 'refactor_project_watchers_notifications' into 'master'
Refactor project watchers notifications
2014-03-29 12:10:53 +00:00
Marin Jankovski c34186f882 Refactor project watchers collecting. 2014-03-28 17:51:13 +01:00
Tom de Bruijn ce857b7cc9 Improve alignment of labels in .well-list items 2014-03-28 13:22:43 +01:00
Tom de Bruijn b7225bead8 Clearfix on well-lists. Pages affected:
Pages affected:
- admin/groups#show
- admin/projets#index
- admin/users#index
- dashboard/issues#index (on small screens)
2014-03-28 11:14:23 +01:00
Yatish Mehta fcdb34373f Consistent format for class objects in javascript 2014-03-28 14:01:06 +05:30
Dmitriy Zaporozhets 0e44039e52 Merge pull request #6395 from dpursehouse/grammar-fixes
Fix another instance of "created at"
2014-03-27 19:53:22 +02:00
Dmitriy Zaporozhets c66218ec94 Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permission
Always show merge status
2014-03-27 19:48:05 +02:00
Jeroen van Baarsen 592dce18b5 Always show merge status
Always show the merge status of a merge request, even if the user has no
permission to do the actual merging.

Fixes
http://feedback.gitlab.com/forums/176466-general/suggestions/5673321-everyone-should-be-able-to-see-a-mr-status
2014-03-27 15:32:28 +01:00
Kyle Fazzari 762c7b4f2b Fixed 500 error when creating issue for project with no commits.
The form was updated to check that the repository wasn't empty before trying
to load the contribution guide.

This fixes #153.
2014-03-27 08:20:43 -04:00
Marin Jankovski 0f05519777 Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2
Refactor Parallel Diff feature and add scrollbars
2014-03-27 08:20:25 +01:00
George Dewar 83f811fff5 Refactor Parallel Diff feature and add scrollbars
Also now removed lines relating to unused comments feature
2014-03-27 09:15:25 +13:00
Dmitriy Zaporozhets 7ddbc92abc Merge branch 'case_insensitive_user_search' into 'master'
Case insensitive user search

As per implementation by Christopher Arnold.
2014-03-26 19:08:35 +00:00
Marin Jankovski 043c9f8640 Change Diff to Changes in views. 2014-03-26 14:00:12 +01:00
Marin Jankovski 1aabfcb92d Change the user search query to be case insensitive. 2014-03-26 12:45:39 +01:00
Andrea Usuelli d21ad74146 Changed the notification sender username to GitLab in Slack Notifier 2014-03-26 10:58:51 +01:00
Dmitriy Zaporozhets c818712dfa Reduce comments font size for events feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-26 11:13:06 +02:00