summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br...Timothy Andrew2016-04-1358-360/+533
|\
| * Merge branch 'notes-input' into 'master' Jacob Schatz2016-04-123-5/+36
| |\
| | * Remove max-width from commentsnotes-inputAnnabel Dunstone2016-04-122-14/+0
| | * Input updatesAnnabel Dunstone2016-04-123-5/+49
| | * Wrap text in notes box if longer than code in diffAnnabel Dunstone2016-04-121-0/+1
| * | Fix todo_target_path for todos where target was removedfix-todo-target-pathDouglas Barbosa Alexandre2016-04-122-0/+4
| |/
| * Merge branch 'issue_14206' into 'master' Jacob Schatz2016-04-125-7/+35
| |\
| | * Merge branch 'master' into issue_14206issue_14206Alfredo Sumaran2016-04-11111-511/+841
| | |\
| | * | Rename method and initialize .timeago insideAlfredo Sumaran2016-04-114-19/+10
| | * | Update datetime in .timeago elementsAlfredo Sumaran2016-04-073-6/+28
| | * | Add datetime_utility.js.coffeeAlfredo Sumaran2016-04-071-0/+15
| | * | Convert time param to TimeAlfredo Sumaran2016-04-071-1/+1
| * | | Merge branch 'check-import-job-status' into 'master' Robert Speicher2016-04-121-2/+8
| |\ \ \
| | * | | Check and report import job status to help diagnose issues with forkingStan Hu2016-04-111-2/+8
| * | | | Merge branch 'project-title-dropdown' into 'master' Jacob Schatz2016-04-126-13/+55
| |\ \ \ \
| | * | | | Updated based on Ruby feedbackPhil Hughes2016-04-121-1/+1
| | * | | | Updated RubyPhil Hughes2016-04-121-3/+6
| | * | | | Updated based on Ruby feedbackPhil Hughes2016-04-122-7/+8
| | * | | | Updated testsPhil Hughes2016-04-122-2/+2
| | * | | | Project dropdown in header uses new dropdownPhil Hughes2016-04-126-13/+51
| * | | | | Merge branch 'member-access-note-row' into 'master' Jacob Schatz2016-04-121-6/+6
| |\ \ \ \ \
| | * | | | | Fixed issue with member access not being visible on notesmember-access-note-rowPhil Hughes2016-04-081-6/+6
| * | | | | | Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' Jacob Schatz2016-04-121-1/+1
| |\ \ \ \ \ \
| | * | | | | | fix quick submit missing in edit merge request pageArinde Eniola2016-04-071-1/+1
| * | | | | | | Merge branch 'admin-pages-layout-sass-update' into 'master' Jacob Schatz2016-04-121-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Updated meqia query for admin/groups search boxadmin-pages-layout-sass-updatePhil Hughes2016-04-071-3/+3
| | |/ / / / / /
| * | | | | | | Merge branch 'right-sidebar-link-hover' into 'master' Jacob Schatz2016-04-121-0/+6
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fixed colour of dropdown link hoverright-sidebar-link-hoverPhil Hughes2016-04-071-0/+6
| | |/ / / / /
| * | | | | | Merge branch 'fix_labels_not_showing_in_todos' into 'master' Jacob Schatz2016-04-123-1/+16
| |\ \ \ \ \ \
| | * | | | | | fix labels not showing on todos pagefix_labels_not_showing_in_todosArinde Eniola2016-04-063-1/+16
| * | | | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-1223-289/+263
| |\ \ \ \ \ \ \
| | * | | | | | | Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-122-8/+1
| | * | | | | | | Fix partial for update project notificationsDouglas Barbosa Alexandre2016-04-111-1/+1
| | * | | | | | | Requires user to be signed in when changing notification settingsDouglas Barbosa Alexandre2016-04-112-0/+4
| | * | | | | | | Reuse `User#notification_settings_for` when it's possibleDouglas Barbosa Alexandre2016-04-114-8/+7
| | * | | | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-1173-368/+567
| | |\ \ \ \ \ \ \
| | * | | | | | | | Use Hash instead of Array on NotificationSetting#level enumDouglas Barbosa Alexandre2016-04-111-3/+1
| | * | | | | | | | Add method to return the user notification setting for a group, or a projectDouglas Barbosa Alexandre2016-04-082-1/+5
| | * | | | | | | | Use default_value_for to set default NotificationSetting#levelDouglas Barbosa Alexandre2016-04-082-9/+6
| | * | | | | | | | Simplify query to retrieve NotificationSetting on controllersDouglas Barbosa Alexandre2016-04-082-2/+2
| | * | | | | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-08137-882/+1871
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Change how notification settings in profile are rendered and updatedDmitriy Zaporozhets2016-03-308-82/+88
| | * | | | | | | | | Improve project notification settings explanationDmitriy Zaporozhets2016-03-301-1/+1
| | * | | | | | | | | Create NotificationSettings object only when user change value in dropdownDmitriy Zaporozhets2016-03-304-5/+34
| | * | | | | | | | | Fix few bugs related to recent notifications refactoringDmitriy Zaporozhets2016-03-302-2/+1
| | * | | | | | | | | Refactor creating notification setting with defaultsDmitriy Zaporozhets2016-03-303-12/+13
| | * | | | | | | | | Remove useless Notification modelDmitriy Zaporozhets2016-03-304-28/+17
| | * | | | | | | | | Refactor notification helper and fix notification serviceDmitriy Zaporozhets2016-03-302-9/+5
| | * | | | | | | | | Small refactoring and cleanup of notification logicDmitriy Zaporozhets2016-03-305-58/+4
| | * | | | | | | | | Update NotificationService to use NotificationSettings instead of membershipDmitriy Zaporozhets2016-03-307-54/+27
View Lorry Controller Status