summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'log-impersonation-events' into 'master' Stan Hu2016-05-052-0/+4
|\
| * Log to application.log when an admin starts and stops impersonating a userStan Hu2016-05-042-0/+4
* | Merge branch 'fix-team-build-state-in-mr-widget' into 'master' Stan Hu2016-05-041-10/+7
|\ \
| * | Feedback from stanhuBenedikt Huss2016-05-051-11/+8
| * | Merge request widget displays TeamCity build state and code coverage correctl...Benedikt Huss2016-05-051-6/+6
* | | Merge branch 'rs-repository-size-format' into 'master' Stan Hu2016-05-041-6/+2
|\ \ \ | |/ / |/| |
| * | Remove `rescue` clause from `repository_size` helperrs-repository-size-formatRobert Speicher2016-05-041-5/+0
| * | Use `number_to_human_size` helper to show repository sizeRobert Speicher2016-05-041-1/+2
* | | Merge branch 'sanitize-new-project-error-message' into 'master' Robert Speicher2016-05-042-1/+7
|\ \ \ | |/ / |/| |
| * | Sanitize repo paths in new project error messageStan Hu2016-05-042-1/+7
* | | Merge branch '17000-comment-links' into 'master' Jacob Schatz2016-05-041-4/+0
|\ \ \
| * | | Remove break-all from links17000-comment-linksAnnabel Dunstone2016-05-041-4/+0
| |/ /
* | | Merge branch 'fix-files-page-colors' into 'master' Jacob Schatz2016-05-042-4/+2
|\ \ \
| * | | Fix table bordersfix-files-page-colorsDmitriy Zaporozhets2016-05-021-3/+1
| * | | Use correct border color between table rowsDmitriy Zaporozhets2016-05-022-2/+2
* | | | Merge branch 'improve-milestone-ui' into 'master' Jacob Schatz2016-05-043-8/+8
|\ \ \ \
| * | | | Improve milestone page UIimprove-milestone-uiDmitriy Zaporozhets2016-05-033-8/+8
* | | | | Merge branch 'invalid-exists-on-new-push' into 'master' Yorick Peterse2016-05-042-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Expire repository exists? and has_visible_content? caches after a push if nec...Stan Hu2016-05-042-0/+2
* | | | | Merge branch 'clean-user-profile-classes' into 'master' Jacob Schatz2016-05-041-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused .contributed-projects classKarlo Soriano2016-04-271-1/+1
* | | | | Merge branch 'gravatar-fix' into 'master' Rémy Coutable2016-05-041-2/+2
|\ \ \ \ \
| * | | | | Use the new admin settings for gravatarArtem Sidorenko2016-05-041-2/+2
* | | | | | Merge branch 'compact-files-list' into 'master' Jacob Schatz2016-05-041-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | Make files list more compact by reducing row height from 47px to 44pxcompact-files-listDmitriy Zaporozhets2016-05-021-1/+1
* | | | | Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-043-40/+25
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use a similar approach to branch creation for tag creationuse-rugged-to-create-tagRémy Coutable2016-05-043-43/+25
| * | | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_ta...Rémy Coutable2016-05-042-23/+26
* | | | | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-043-5/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-293-5/+7
* | | | | Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \
| * | | | | Remove unnecessary method call in events viewKarlo Soriano2016-05-011-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'create-wikis-during-check' into 'master' Douwe Maan2016-05-041-11/+23
|\ \ \ \ \
| * | | | | Initialize wikis on legacy projects during checkJacob Vosmaer2016-04-261-11/+23
* | | | | | Merge branch 'revert-devise-async' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ \
| * | | | | | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rs-unique-signup-fields' into 'master' Douwe Maan2016-05-042-2/+9
|\ \ \ \ \ \
| * | | | | | Improve uniqueness of field names on the signup formrs-unique-signup-fieldsRobert Speicher2016-04-192-2/+9
* | | | | | | Merge branch 'signout-rel-url' into 'master' Robert Speicher2016-05-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use sign out path only if not emptyArtem Sidorenko2016-05-031-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Improve the Two-factor Authentication sign-in text [ci skip]connorshea2016-05-031-2/+2
|/ / / / / /
* | | | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-0213-66/+96
|\ \ \ \ \ \
| * | | | | | Prevent privilege escalation via notes APIRobert Speicher2016-04-261-0/+11
| * | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-04-2612-66/+85
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master' Robert Speicher2016-04-251-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | Prevent private project name and namespace from leaking in the new MR viewRémy Coutable2016-04-251-0/+3
| | * | | | | | | Merge branch 'fix-impersonation-issue' into 'master' Robert Speicher2016-04-255-46/+42
| | |\ \ \ \ \ \ \
| | | * | | | | | | Store original user in variableDouwe Maan2016-04-221-2/+2
| | | * | | | | | | Remove unused methodDouwe Maan2016-04-221-4/+0
| | | * | | | | | | Fix issue with impersonationDouwe Maan2016-04-225-46/+46
View Lorry Controller Status