summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-207-26/+28
|\
| * Prevent default action when closing zen modeRobert Schilling2014-09-201-0/+1
| * Merge pull request #7801 from cirosantilli/dry-zen-viewRobert Schilling2014-09-205-19/+22
| |\
| | * Factor zen mode.Ciro Santilli2014-09-205-19/+22
| * | Merge pull request #7788 from bbodenmiller/patch-25Robert Schilling2014-09-191-1/+1
| |\ \
| | * | link to page that discusses how to generate ssh keyBen Bodenmiller2014-09-191-1/+1
| | |/
| * | Improve zen mode internals.Ciro Santilli2014-09-191-6/+4
| |/
* | Fix star/fork button UI issue if count > 100Dmitriy Zaporozhets2014-09-191-1/+1
|/
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-151-1/+1
|\
| * Fix grammatical error in 'not merged changes' msgTamer Sherif2014-09-141-1/+1
* | Merge branch 'implement_comments_on_parallel_diff' into 'master'Dmitriy Zaporozhets2014-09-154-22/+58
|\ \ | |/ |/|
| * Move organizing of comments to helper.Marin Jankovski2014-09-122-14/+22
| * Remove unecesarry array operations.Marin Jankovski2014-09-123-17/+16
| * Add comments on the side-by-side diff.Marin Jankovski2014-09-124-15/+44
* | Adding ability to configure webhook timeout via gitlab.ymlWes Gurney2014-09-121-1/+1
|/
* Merge pull request #7662 from Razer6/disable_buttons_on_empty_formDmitriy Zaporozhets2014-09-123-7/+12
|\
| * Disable buttons if required forms are emptyRobert Schilling2014-09-113-7/+12
* | Merge pull request #7522 from Razer6/fix_tags_countDmitriy Zaporozhets2014-09-124-14/+18
|\ \
| * | update tags count if tag gets deletedRobert Schilling2014-09-124-14/+18
| |/
* | Merge pull request #7713 from bbodenmiller/patch-5Sytse Sijbrandij2014-09-121-0/+1
|\ \
| * | add requests linkBen Bodenmiller2014-09-121-0/+1
* | | Merge pull request #7737 from Razer6/feature/zenmasterDmitriy Zaporozhets2014-09-128-8/+215
|\ \ \
| * | | Close Zen mode by ESC, foward/backwardRobert Schilling2014-09-114-3/+59
| * | | Implement zen mode for issues/MRs/notesRobert Schilling2014-09-115-6/+157
| | |/ | |/|
* | | Fix serialize migration. Fixes #7734Drew Blessing2014-09-111-1/+6
|/ /
* | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-09-111-4/+0
|\ \
| * \ Merge remote-tracking branch 'origin/master' into feature-oauth-refactoringJan-Willem van der Meer2014-09-1186-536/+747
| |\ \
| * | | Refactor Oauth::User class to use instance methodsJan-Willem van der Meer2014-09-031-4/+0
* | | | Make labels clickableDmitriy Zaporozhets2014-09-114-4/+8
| |/ / |/| |
* | | Merge branch 'project-destroy-redirect' into 'master'Dmitriy Zaporozhets2014-09-111-1/+9
|\ \ \
| * | | Incorporating Dmitriy's referrer-based routing suggestionKevin Boyd2014-09-051-1/+6
| * | | Fine-tune the Remove Project redirect. Now it redirects to admin_projects_pat...Kevin Boyd2014-08-291-1/+4
* | | | Merge pull request #7730 from bbodenmiller/patch-12Dmitriy Zaporozhets2014-09-112-2/+2
|\ \ \ \
| * | | | url -> URLBen Bodenmiller2014-09-101-1/+1
| * | | | url -> URLBen Bodenmiller2014-09-101-1/+1
* | | | | Increase import timeout from 2 to 4 minutesBen Bodenmiller2014-09-101-1/+1
|/ / / /
* | | | Typo localy -> locally.Ciro Santilli2014-09-101-1/+1
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-1011-67/+39
|\ \ \ \
| * \ \ \ Merge pull request #7705 from dblessing/serialize_service_propertiesDmitriy Zaporozhets2014-09-1011-67/+39
| |\ \ \ \
| | * | | | Serialize services propertiesDrew Blessing2014-09-1011-67/+39
* | | | | | Merge branch 'word_wrap_in_description' into 'master'Dmitriy Zaporozhets2014-09-101-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Wrap text that overflows the description field.Marin Jankovski2014-09-101-0/+2
* | | | | | Wrap should always be enabled for parallel diff.Marin Jankovski2014-09-102-4/+5
|/ / / / /
* | | | | Merge branch 'parallel_diff_refactor' into 'master'Dmitriy Zaporozhets2014-09-0924-282/+249
|\ \ \ \ \
| * | | | | Fix typo.Marin Jankovski2014-09-092-2/+2
| * | | | | Add line code to parallel diff for linking.Marin Jankovski2014-09-092-12/+13
| * | | | | Use the new path to the partial, move the diff related methods to the new hel...Marin Jankovski2014-09-093-14/+13
| * | | | | Fix usage of diff file mode changeDmitriy Zaporozhets2014-09-081-1/+1
| * | | | | optimize show_diff_size_warning?Dmitriy Zaporozhets2014-09-083-6/+11
| * | | | | Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets2014-09-0813-104/+100