summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'use_fullpath' into 'master'Dmitriy Zaporozhets2014-07-221-3/+12
|\
| * Call store_location_for once.Marin Jankovski2014-07-221-10/+12
| * If the referer is not set, use fullpath.Marin Jankovski2014-07-211-1/+8
* | Fix project default branch changeDmitriy Zaporozhets2014-07-211-1/+1
|/
* Merge branch 'file-upload-bugfix' into 'master'Dmitriy Zaporozhets2014-07-211-1/+1
|\
| * Fixing an issue where pages with multiple dropzones can trigger multiple file...GitLab2014-07-171-1/+1
* | Merge branch 'fix/avatar_relative_url' into 'master'Dmitriy Zaporozhets2014-07-211-1/+1
|\ \
| * | Don't use URI joinDrew Blessing2014-07-071-1/+1
* | | Fix user params when edit from admin areaDmitriy Zaporozhets2014-07-161-2/+4
| |/ |/|
* | If MR commits are empty if does not mean compare failedDmitriy Zaporozhets2014-07-151-1/+1
* | Merge branch 'fix-huge-mr' into 'master'Dmitriy Zaporozhets2014-07-1521-297/+335
|\ \
| * | Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-1517-192/+165
| * | Cleanup diff stats UIDmitriy Zaporozhets2014-07-152-16/+28
| * | Refactor MR build processDmitriy Zaporozhets2014-07-157-116/+169
* | | Show milestone state on group milestone show page.Marin Jankovski2014-07-151-2/+2
|/ /
* | Milestone is closed only if all milestones are closed.Marin Jankovski2014-07-141-3/+3
* | Merge branch 'branches_with_no_parent' into 'master'Dmitriy Zaporozhets2014-07-142-71/+78
|\ \
| * | Error message needs to be correct.Marin Jankovski2014-07-141-1/+1
| * | Branches without parent commit cannot be merged.Marin Jankovski2014-07-142-71/+78
* | | Merge pull request #7131 from skv-headless/per_request_rules_cachingDmitriy Zaporozhets2014-07-141-24/+26
|\ \ \ | |/ / |/| |
| * | per request project rules cachingskv-headless2014-06-141-24/+26
* | | Restore blue color for sign-in buttonDmitriy Zaporozhets2014-07-141-3/+1
* | | Merge branch 'improve-login-page' into 'master'Dmitriy Zaporozhets2014-07-134-18/+24
|\ \ \
| * | | Improve login page behaviourDmitriy Zaporozhets2014-07-134-18/+24
* | | | Use devise stored_location to redirect after signing for both public and priv...Marin Jankovski2014-07-112-1/+15
* | | | Revert "Merge branch 'redirect_after_login' into 'master'"Marin Jankovski2014-07-114-12/+6
|/ / /
* | | Make brand image fill 100% width of spaceDmitriy Zaporozhets2014-07-111-1/+1
* | | Add bottom links for sign-in page so I can get to Public areaDmitriy Zaporozhets2014-07-112-0/+10
* | | Rename brand helperDmitriy Zaporozhets2014-07-111-1/+1
* | | Small fixes for sign-in page textDmitriy Zaporozhets2014-07-111-2/+2
* | | Less distracting git clone line for public pageDmitriy Zaporozhets2014-07-112-3/+3
* | | Improve signin/signup/reset pages UIDmitriy Zaporozhets2014-07-119-116/+121
* | | Add box shadow to login boxDmitriy Zaporozhets2014-07-111-0/+1
* | | Improve login page for small screensDmitriy Zaporozhets2014-07-111-2/+2
* | | Fix brand logoDmitriy Zaporozhets2014-07-111-0/+0
* | | Use same login layout between CE and EE versionsDmitriy Zaporozhets2014-07-114-11/+44
* | | Add html_escape to project description. auto_link set description to html_saf...Dmitriy Zaporozhets2014-07-111-1/+1
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-07-107-6/+61
|\ \ \
| * \ \ Merge branch 'upgrade_devise' into 'master'Dmitriy Zaporozhets2014-07-107-6/+61
| |\ \ \
| | * | | Override strong params for sign up.Marin Jankovski2014-07-102-1/+4
| | * | | Update to accomodate devise deprecations and backward incompatible changes.Marin Jankovski2014-07-104-5/+5
| | * | | Check for the correct param for token.Marin Jankovski2014-07-101-1/+6
| | * | | Try to keep token authenticable compatibilityMarin Jankovski2014-07-093-1/+48
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-07-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix gitlab_markdown_helper method header typo. rquest => request.tbpgr2014-07-101-1/+1
* | | | | Show counters in sidebar filter in same way like we did for projects pageDmitriy Zaporozhets2014-07-1010-9/+52
|/ / / /
* | | | Prevent html injection on commits page by commit messageDmitriy Zaporozhets2014-07-102-3/+12
* | | | Merge branch 'group_milestones_description' into 'master'Dmitriy Zaporozhets2014-07-101-0/+12
|\ \ \ \
| * | | | Use heading instead of strong and line breaks in description.Marin Jankovski2014-07-101-3/+1
| * | | | Add milestone descriptions on the group show page.Marin Jankovski2014-07-101-0/+14
View Lorry Controller Status