summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/permissions-when-importing-members' into 'master' Douwe Maan2016-04-051-3/+8
|\
| * Respond 404 when unauthorized user imports membersfix/permissions-when-importing-membersGrzegorz Bizon2016-04-051-1/+1
| * Do not leak project exists when importing membersGrzegorz Bizon2016-04-051-4/+4
| * Check permissions when importing project membersGrzegorz Bizon2016-04-051-2/+7
* | Merge branch 'reorder-language' into 'master' Yorick Peterse2016-04-051-3/+7
|\ \ | |/ |/|
| * Update language only on HEAD of the repositoryreorder-languageKamil Trzcinski2016-04-051-0/+3
| * Update language after doing all other operationsKamil Trzcinski2016-04-051-3/+4
* | Merge branch 'fix-gh-pr-import' into 'master' Yorick Peterse2016-04-052-0/+7
|\ \
| * | Flush repository cache before import project datafix-gh-pr-importDouglas Barbosa Alexandre2016-04-042-0/+7
* | | Wrap images in discussions and wikis with a link to the image source using Im...connorshea2016-04-041-0/+6
* | | Merge branch 'remove-2fa-status' into 'master' Jacob Schatz2016-04-041-2/+0
|\ \ \
| * | | Remove 2FA status on enable pageremove-2fa-statusRobert Schilling2016-03-291-2/+0
* | | | Merge branch 'admin-pages-layout' into 'master' Dmitriy Zaporozhets2016-04-043-35/+49
|\ \ \ \ | |_|/ / |/| | |
| * | | Single quotes paradiseadmin-pages-layoutDmitriy Zaporozhets2016-04-041-4/+4
| * | | Improve UI for admin/groups pageDmitriy Zaporozhets2016-04-043-35/+49
* | | | Merge branch 'dz-admin-area-fixes' into 'master' Jacob Schatz2016-04-045-9/+11
|\ \ \ \
| * | | | Fix missing paddings in admin areaDmitriy Zaporozhets2016-04-044-8/+10
| * | | | Dont use monospace font for namesDmitriy Zaporozhets2016-04-041-1/+1
| |/ / /
* | | | Merge branch 'hide_profile_activity_on_mobile' into 'master' Jacob Schatz2016-04-042-1/+7
|\ \ \ \
| * | | | hide user profile activity graph on mobile and enable horizontal scroll for m...hide_profile_activity_on_mobileArinde Eniola2016-04-012-1/+7
* | | | | Merge branch 'fix-award-emoji-menu' into 'master' Jacob Schatz2016-04-042-2/+4
|\ \ \ \ \
| * | | | | Fix award emoji picker for relative_urlSandra Freihofer2016-04-012-2/+4
* | | | | | Merge branch '14083-build-labels' into 'master' Jacob Schatz2016-04-041-1/+1
|\ \ \ \ \ \
| * | | | | | Add labels to block element14083-build-labelsAnnabel Dunstone2016-04-011-1/+1
| |/ / / / /
* | | | | | Merge branch 'fix-ui-event' into 'master' Dmitriy Zaporozhets2016-04-041-1/+1
|\ \ \ \ \ \
| * | | | | | Fix event rendering when create projectfix-ui-eventDmitriy Zaporozhets2016-04-041-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-044-11/+21
|\ \ \ \ \ \
| * | | | | | Fix incorrect variable nameBaldinof2016-04-041-1/+1
| * | | | | | Move unlink fork logic to a serviceBaldinof2016-03-223-21/+20
| * | | | | | Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-1459-318/+807
| |\ \ \ \ \ \
| * | | | | | | Close merge requests when removing fork relationBaldinof2016-03-113-2/+13
* | | | | | | | Fix transparent bg for expand sidebar buttonDmitriy Zaporozhets2016-04-041-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'update_repository_from_ee' into 'master' Douwe Maan2016-04-041-6/+10
|\ \ \ \ \ \ \
| * | | | | | | Migrate Repository#local_branches from gitlab-ee.update_repository_from_eeRubén Dávila2016-04-011-6/+10
* | | | | | | | Merge branch 'space-before-brace-scss-lint' into 'master' Jacob Schatz2016-04-0413-19/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable SpaceBeforeBrace rule for SCSS Lintconnorshea2016-03-3013-19/+19
* | | | | | | | | Merge branch 'fix-mr-for-orphaned-branches' into 'master' Rémy Coutable2016-04-041-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix creation of merge requests for orphaned branchesStan Hu2016-04-041-2/+5
* | | | | | | | | | Merge branch 'issue_14853' into 'master' Yorick Peterse2016-04-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix bug related to filtering Issues by Label/Milestone.issue_14853Rubén Dávila2016-04-021-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'build-updates' into 'master' Douwe Maan2016-04-035-35/+124
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Put back hiding of modalbuild-updatesPhil Hughes2016-03-211-0/+1
| * | | | | | | | | Updated based on feedbackPhil Hughes2016-03-212-46/+60
| * | | | | | | | | Removed modal hidePhil Hughes2016-03-181-1/+0
| * | | | | | | | | Updated to fix issues risen during feedbackPhil Hughes2016-03-184-67/+53
| * | | | | | | | | Merge request title is in the notificationPhil Hughes2016-03-183-4/+9
| * | | | | | | | | Commit SHA comes from JSONPhil Hughes2016-03-184-43/+49
| * | | | | | | | | Fix code style issues.Jacob Schatz2016-03-181-3/+3
| * | | | | | | | | Using status from ajax call.Jacob Schatz2016-03-182-25/+13
| * | | | | | | | | Removes name from fileJacob Schatz2016-03-182-4/+2