summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'no_email_on_notification_level_change' into 'master'Dmitriy Zaporozhets2014-04-041-1/+1
|\
| * Only send email when project access level changes.Marin Jankovski2014-04-031-1/+1
* | Add note when MR assignee changes. Add more tests to MR servicesDmitriy Zaporozhets2014-04-031-0/+4
* | Mention protected branch force pushDmitriy Zaporozhets2014-04-031-0/+1
|/
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-032-4/+4
|\
| * Merge pull request #6639 from yatish27/ConsistentJSFormatDmitriy Zaporozhets2014-04-032-4/+4
| |\
| | * Consistent format for class objects in javascriptYatish Mehta2014-03-282-4/+4
* | | Merge branch 'reduce-observers' into 'master'Dmitriy Zaporozhets2014-04-0314-96/+164
|\ \ \ | |/ / |/| |
| * | More test fixesDmitriy Zaporozhets2014-04-031-0/+1
| * | Fix MR fork validation and services loadDmitriy Zaporozhets2014-04-033-2/+8
| * | Use MergeRequest services in API and controllersDmitriy Zaporozhets2014-04-024-26/+25
| * | MergeRequest services for create, update, close and reopenDmitriy Zaporozhets2014-04-025-0/+100
| * | Remove MergeRequest observerDmitriy Zaporozhets2014-04-021-43/+0
| * | Remove KeysObserverDmitriy Zaporozhets2014-04-022-19/+24
| * | Remove EmailsObserverDmitriy Zaporozhets2014-04-022-8/+8
* | | Do not require modernizr.Marin Jankovski2014-04-031-1/+0
|/ /
* | Merge branch 'reduce-observers' into 'master'Dmitriy Zaporozhets2014-04-029-55/+115
|\ \
| * | Fix testsDmitriy Zaporozhets2014-04-024-4/+4
| * | Fix assignee change in Issues::UpdateServiceDmitriy Zaporozhets2014-04-021-1/+1
| * | Add support for close/reopen actions in update serviceDmitriy Zaporozhets2014-04-022-2/+11
| * | Create services for issue close and reopenDmitriy Zaporozhets2014-04-025-10/+43
| * | Remove issue observerDmitriy Zaporozhets2014-04-021-29/+0
| * | Move update issue code to separate serviceDmitriy Zaporozhets2014-04-025-18/+39
| * | Move code for issue creation to service.Dmitriy Zaporozhets2014-04-024-10/+36
* | | Merge branch 'issue_search_filter' into 'master'Dmitriy Zaporozhets2014-04-021-0/+5
|\ \ \
| * | | Pass the required parameters on search submit.Marin Jankovski2014-04-021-0/+5
* | | | Merge branch 'fix-jquery-assets' into 'master'Dmitriy Zaporozhets2014-04-024-258/+23
|\ \ \ \
| * | | | Replace custom jquery css with native one. Fixes wrong assets path for calend...Dmitriy Zaporozhets2014-04-024-258/+23
| |/ / /
* | | | Better title suggestion for new MRDmitriy Zaporozhets2014-04-022-2/+2
|/ / /
* | | Add comments, fix style, better names for notification methods.Marin Jankovski2014-04-011-29/+40
* | | Use group notification settings while honoring project settings.Marin Jankovski2014-04-011-32/+41
* | | Add or remove watchers from list based on their notification settings.Marin Jankovski2014-04-011-15/+31
|/ /
* | Move branch creation logic in serviceDmitriy Zaporozhets2014-04-012-5/+14
* | Merge pull request #6660 from robertboloc/patch-1Dmitriy Zaporozhets2014-03-311-1/+1
|\ \
| * | Updated notification messageRobert Boloc2014-03-311-1/+1
| * | Grammar correction: "View in Gitlab"Robert Boloc2014-03-311-1/+1
* | | Make the repository downloads path configurableJacob Vosmaer2014-03-311-1/+1
|/ /
* | Merge branch 'refactor_project_watchers_notifications' into 'master'Dmitriy Zaporozhets2014-03-291-13/+33
|\ \
| * | Refactor project watchers collecting.Marin Jankovski2014-03-281-13/+33
| |/
* | Improve alignment of labels in .well-list itemsTom de Bruijn2014-03-289-27/+42
* | Clearfix on well-lists. Pages affected:Tom de Bruijn2014-03-282-1/+6
|/
* Merge pull request #6395 from dpursehouse/grammar-fixesDmitriy Zaporozhets2014-03-271-1/+1
|\
| * Fix another instance of "created at"David Pursehouse2014-02-241-1/+1
* | Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permissionDmitriy Zaporozhets2014-03-271-1/+4
|\ \
| * | Always show merge statusJeroen van Baarsen2014-03-271-1/+4
* | | Fixed 500 error when creating issue for project with no commits.Kyle Fazzari2014-03-271-1/+1
|/ /
* | Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2Marin Jankovski2014-03-274-71/+147
|\ \
| * | Refactor Parallel Diff feature and add scrollbarsGeorge Dewar2014-03-274-71/+147
* | | Merge branch 'case_insensitive_user_search' into 'master'Dmitriy Zaporozhets2014-03-261-1/+1
|\ \ \
| * | | Change the user search query to be case insensitive.Marin Jankovski2014-03-261-1/+1