summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'resolve-discussions-timeago' into 'master' Fatih Acet2016-11-242-4/+7
|\
| * Fixed timeago when creating new discussionresolve-discussions-timeagoPhil Hughes2016-11-231-1/+1
| * Fixed resolved discussion timeago not renderingPhil Hughes2016-11-221-3/+6
* | Merge branch 'fixed-commit-timeago' into 'master' Fatih Acet2016-11-241-2/+4
|\ \
| * | Fixed commit time not rendering after initial page loadfixed-commit-timeagoPhil Hughes2016-11-231-2/+4
* | | Merge branch '23813-fix-username-character-validation-message' into 'master' Fatih Acet2016-11-241-1/+2
|\ \ \
| * | | properly escape username validation error message flash23813-fix-username-character-validation-messageMike Greiling2016-11-231-1/+2
* | | | Merge branch 'issue-boards-scrollable-element' into 'master' Fatih Acet2016-11-241-0/+1
|\ \ \ \
| * | | | Fixed issue boards scrolling with a lot of lists & issuesPhil Hughes2016-11-241-0/+1
* | | | | Merge branch 'boards-issue-sorting' into 'master' Fatih Acet2016-11-244-6/+11
|\ \ \ \ \
| * | | | | Fixed dragging issue moving wrong issue after multiple drags of issueboards-issue-sortingPhil Hughes2016-11-242-1/+2
| * | | | | Fixed issue boards issue sorting when dragging issue into listPhil Hughes2016-11-243-5/+9
* | | | | | Merge branch '24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analyt...Fatih Acet2016-11-241-2/+6
|\ \ \ \ \ \
| * | | | | | Take only objects for the events list24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analyticsAlfredo Sumaran2016-11-231-2/+6
* | | | | | | Merge branch '24779-last-deployment-call-on-nil-environment-fix' into 'master' Kamil Trzciński2016-11-241-3/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add testsKamil Trzcinski2016-11-231-2/+1
| * | | | | | changes environment.last_deployment to a try expression so it does not fail i...tiagonbotelho2016-11-221-2/+2
* | | | | | | Merge branch 'backport-commands-params' into 'master' Douwe Maan2016-11-243-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Backport Note#commands_changes from EEbackport-commands-paramsDouwe Maan2016-11-243-0/+6
* | | | | | | | Merge branch 'mrchrisw/add-namespace-logging' into 'master' Robert Speicher2016-11-241-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Log mv_namespace parametersmrchrisw/add-namespace-loggingChris Wilson2016-11-241-0/+2
* | | | | | | | | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-246-9/+66
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-236-9/+66
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'simplify-create-new-list-issue-boards' into 'master' Annabel Dunstone Gray2016-11-243-8/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Simplify copy on "Create a new list" dropdown in Issue Boardsvrod2016-11-233-8/+6
* | | | | | | | | Fix `LFS enabled` select box.Patricio Cano2016-11-231-6/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'move-timeago-to-vendor-dir' into 'master' Alfredo Sumaran2016-11-233-244/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | timeago should be a dependency of datetime_utilitymove-timeago-to-vendor-dirMike Greiling2016-11-223-6/+11
| * | | | | | | | move timeago.js to vendor directoryMike Greiling2016-11-222-239/+1
* | | | | | | | | Merge branch '24851-collapsed-system-note-list-shadow-looks-weird' into 'mast...Fatih Acet2016-11-231-3/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixes non-retina shadow and browser zoom issueNur Rony2016-11-231-3/+5
* | | | | | | | | | Merge branch 'use-default-closest-if-available' into 'master' Fatih Acet2016-11-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Use default `closest` if available!use-default-closest-if-availableLuke "Jared" Bennett2016-11-231-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'issue-boards-dragging-fix' into 'master' Fatih Acet2016-11-234-5/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fixed dragging issues on issue boardsissue-boards-dragging-fixPhil Hughes2016-11-234-5/+7
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Adds polyfill for CustomEventcustom-event-polyfillFilipa Lacerda2016-11-231-0/+12
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master' Sean McGivern2016-11-231-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeableDouwe Maan2016-11-231-1/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'milestone_start_date' into 'master' Sean McGivern2016-11-2315-81/+108
|\ \ \ \ \ \ \
| * | | | | | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-2315-81/+108
| | |/ / / / / | |/| | | | |
* | | | | | | Update ProjectTeam#fetch_members to use project authorizationsfix/drop-project-authorized-for-userAhmad Sherif2016-11-232-53/+8
* | | | | | | Update ProjectTeam#max_member_access_for_user_ids to use project authorizationsAhmad Sherif2016-11-232-43/+7
* | | | | | | Update user's authorized projects if project is allowed to share with groupAhmad Sherif2016-11-232-1/+11
* | | | | | | Drop Project#authorized_for_user? in favor of ProjectTeam#member?Ahmad Sherif2016-11-233-11/+7
* | | | | | | Refresh user's authorized projects when one of his memberships are updatedAhmad Sherif2016-11-231-1/+1
* | | | | | | Change personal projects access level to master in User#project_authorization...Ahmad Sherif2016-11-231-1/+1
* | | | | | | Use the minimum access level of group link and group member when inserting au...Ahmad Sherif2016-11-231-1/+1
|/ / / / / /
* | | | | | Merge branch 'dev-issue-24554' into 'master' Sean McGivern2016-11-231-1/+1
|\ \ \ \ \ \
| * | | | | | Edit help text to clarify that tags are annotated.Liz Lam2016-11-211-1/+1
* | | | | | | Merge branch 'status-badge-spacing' into 'master' Fatih Acet2016-11-233-18/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
View Lorry Controller Status