summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Order labels by nameDmitriy Zaporozhets2014-07-301-1/+1
* Merge branch 'epic/refactor-labels' into 'master'Dmitriy Zaporozhets2014-07-305-7/+51
|\
| * Improve labelsDmitriy Zaporozhets2014-07-301-4/+9
| * Add create/update to Labels controllerDmitriy Zaporozhets2014-07-301-1/+40
| * Refactor label rendering and default label set generationDmitriy Zaporozhets2014-07-291-1/+1
| * Allow set labels from Issue/MR formsDmitriy Zaporozhets2014-07-292-2/+2
| * Replace project labels with tags to prevent name conflict with GitLab labelsDmitriy Zaporozhets2014-07-292-3/+3
* | Require current password even if password was expiredDmitriy Zaporozhets2014-07-291-0/+5
|/
* Fix variable order on compare pageDmitriy Zaporozhets2014-07-291-2/+2
* Use CompareService for compare pageDmitriy Zaporozhets2014-07-291-7/+14
* Merge pull request #7383 from Razer6/fix_test_hooks_empty_projectDmitriy Zaporozhets2014-07-281-1/+6
|\
| * Do not execute hooks on empty projects, fixes #6108Robert Schilling2014-07-271-1/+6
* | Merge branch 'fix-mr-500-error' into 'master'Dmitriy Zaporozhets2014-07-281-1/+1
|\ \
| * | Improve MR buildingDmitriy Zaporozhets2014-07-281-1/+1
| |/
* | Merge branch 'only_redirect_to_referer_from_public' into 'master'Dmitriy Zaporozhets2014-07-281-2/+6
|\ \ | |/ |/|
| * Only redirect to referrer from public GitLab pagesJacob Vosmaer2014-07-281-2/+6
* | Most starred projects page for Explore areaDmitriy Zaporozhets2014-07-251-0/+6
|/
* Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosant...Dmitriy Zaporozhets2014-07-241-0/+8
|\
| * Fix hound.Ciro Santilli2014-07-171-1/+1
| * Add star count, view logic, more tests.Ciro Santilli2014-07-171-0/+3
| * Add project stars.Ciro Santilli2014-07-171-0/+5
* | Merge pull request #6650 from lloeki/wiki_images_attachmentsDmitriy Zaporozhets2014-07-231-3/+1
|\ \
| * | Added ability to serve files in wiki repositoryLoic Nageleisen2014-06-071-3/+1
* | | Merge branch 'new_user_password_set' into 'master'Dmitriy Zaporozhets2014-07-231-1/+2
|\ \ \
| * | | Do not set password expiry.Marin Jankovski2014-07-151-1/+1
| * | | Do not sent a generated password via email for admin created user.Marin Jankovski2014-07-151-0/+1
* | | | Refactor explore areaDmitriy Zaporozhets2014-07-234-28/+21
* | | | Explore areaDmitriy Zaporozhets2014-07-232-1/+13
* | | | Merge branch 'public-groups' of https://github.com/innogames/gitlabhq into 7-...Dmitriy Zaporozhets2014-07-221-0/+14
|\ \ \ \
| * | | | Added public groups area to enhance searching and exploring of projectsdreis2014-07-151-0/+14
* | | | | 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
|/ / / /
* | | | Fix user params when edit from admin areaDmitriy Zaporozhets2014-07-161-2/+4
* | | | Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-153-28/+10
* | | | Refactor MR build processDmitriy Zaporozhets2014-07-151-47/+21
| |/ / |/| |
* | | Error message needs to be correct.Marin Jankovski2014-07-141-1/+1
* | | Branches without parent commit cannot be merged.Marin Jankovski2014-07-141-8/+12
* | | 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-112-7/+1
|/ /
* | Override strong params for sign up.Marin Jankovski2014-07-102-1/+4
* | Update to accomodate devise deprecations and backward incompatible changes.Marin Jankovski2014-07-101-2/+2
* | Check for the correct param for token.Marin Jankovski2014-07-101-1/+6
* | Try to keep token authenticable compatibilityMarin Jankovski2014-07-091-0/+15
* | Merge branch 'redirect_betwee_tree_and_blob' into 'master'Dmitriy Zaporozhets2014-07-092-4/+15
|\ \
| * | Check if blob or tree and redirect to the correct one.Marin Jankovski2014-07-072-4/+15
* | | Fix 500 on repo archive downloadDmitriy Zaporozhets2014-07-081-1/+1
* | | Merge pull request #7222 from jhund/fix-5936Dmitriy Zaporozhets2014-07-081-2/+0
|\ \ \ | |/ / |/| |
| * | Don't remove trailing newline when editing a file in web UI editor:Jo Hund2014-06-271-2/+0
View Lorry Controller Status