summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix spacing between icon and word in status badgestatus-badge-spacingAnnabel Dunstone Gray2016-11-223-18/+10
* | | | | | Merge branch 'fix_sidekiq_stats_in_admin_area' into 'master' Robert Speicher2016-11-231-7/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix sidekiq stats in admin areablackst0ne2016-11-231-7/+3
* | | | | | Merge branch '24756-clean-up-eslintrc-globals' into 'master' Alfredo Sumaran2016-11-2314-6/+32
|\ \ \ \ \ \
| * | | | | | clean up globals exemptions within .eslintrcMike Greiling2016-11-2214-6/+32
* | | | | | | Merge branch '24266-afraid-to-press-the-orange-button-on-merge-request-screen...Fatih Acet2016-11-223-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Use btn-primary for running builds btnAnnabel Dunstone Gray2016-11-221-3/+3
| * | | | | | | If Build running change accept merge request when build succeeds button from ...Dimitrie Hoekstra2016-11-182-2/+2
* | | | | | | | Merge branch '24739-collapsed-build-list-sorting' into 'master' Fatih Acet2016-11-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | sort pipeline graph builds and build groups by nameMike Greiling2016-11-221-1/+1
* | | | | | | | | Merge branch '24639-mr-widget-updates' into 'master' Fatih Acet2016-11-222-39/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove view details link from MR widget24639-mr-widget-updatesAnnabel Dunstone Gray2016-11-181-3/+0
| * | | | | | | | | Unify all MR widget text colors and background colorsAnnabel Dunstone Gray2016-11-181-36/+1
* | | | | | | | | | Merge branch 'disable-calendar-deselection' into 'master' Fatih Acet2016-11-221-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix deselecting calendar days on contribution graphClement Ho2016-11-041-0/+1
* | | | | | | | | | | Merge branch '24161-non-intuitive-buttons-for-import-sources-in-administrator...Fatih Acet2016-11-222-8/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Swapped buttons for checkboxes24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disableLuke "Jared" Bennett2016-11-212-8/+6
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |