summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-blame-lines-grouping' into 'master'Douwe Maan2015-08-202-19/+43
|\
| * Fix blame view line groupingsStan Hu2015-08-202-19/+43
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-2026-134/+183
|\ \
| * | Cleanup groups pages UI a bittop-menu-improvementsDmitriy Zaporozhets2015-08-203-11/+5
| * | Small ui improvements to snippet pageDmitriy Zaporozhets2015-08-201-8/+5
| * | Cleanup snippets index pagesDmitriy Zaporozhets2015-08-203-25/+15
| * | Rebuild navigation for dashboardDmitriy Zaporozhets2015-08-2019-97/+112
| * | Refactor sidebar navigation for dashboardDmitriy Zaporozhets2015-08-2011-15/+68
| |/
* | Import sources: show only enabled sourcesArtem Sidorenko2015-08-207-75/+118
* | Import sources: settings in the admin interfaceArtem Sidorenko2015-08-204-1/+55
|/
* Merge branch '2fa-message-improvement' into 'master'Sytse Sijbrandij2015-08-191-1/+3
|\
| * Improved 2FA warning message about lost codesPatricio Cano2015-08-191-1/+3
* | Show colored icons like in the admin listingArtem Sidorenko2015-08-191-1/+2
* | Show label on archived projectsArtem Sidorenko2015-08-192-1/+5
* | Allow listing of archived projectsArtem Sidorenko2015-08-194-1/+8
|/
* Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-1939-326/+463
|\
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-1718-44/+97
| |\
| * | Fix typo in text when raise pre-receive exceptionDmitriy Zaporozhets2015-08-171-1/+1
| * | save repo empty state into variable for proper resultpre-receive-wo-satellitesDmitriy Zaporozhets2015-08-171-2/+3
| * | Remove unnecessary fileDmitriy Zaporozhets2015-08-141-5/+0
| * | merge with support of pre-receive and post-receive hooksDmitriy Zaporozhets2015-08-142-20/+12
| * | Refactor how repository makes commit with pre/post receive hooksDmitriy Zaporozhets2015-08-146-95/+94
| * | Refactor pre/post receive commit services into one classDmitriy Zaporozhets2015-08-143-153/+16
| * | Make sure target has not changed during pre-receive hookDmitriy Zaporozhets2015-08-141-1/+8
| * | Capture pre-receive exceptionDmitriy Zaporozhets2015-08-132-7/+19
| * | Implement commit transaction with pre-receive and post-receive hooks for web ...Dmitriy Zaporozhets2015-08-137-9/+118
| * | Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-118-33/+48
| |\ \
| * | | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-1157-576/+707
* | | | Use File.join instead of Rails.root.join in HelpControllerRobert Speicher2015-08-181-2/+4
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-08-181-0/+4
|\ \ \ \
| * \ \ \ Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets2015-08-181-0/+4
| |\ \ \ \
| | * | | | Clear cache to prevent listing deleted branches after MR removes source branchStan Hu2015-08-141-0/+4
* | | | | | capitalize URL in "Home page URL"Ben Bodenmiller2015-08-171-1/+1
|/ / / / /
* | | | | Merge branch 'code-import-error-ui-improvements' into 'master'Douwe Maan2015-08-171-1/+1
|\ \ \ \ \
| * | | | | Improve error message display when project fails to importStan Hu2015-08-111-1/+1
| | |/ / / | |/| | |
* | | | | Revert "Fix for #9527"Dmitriy Zaporozhets2015-08-171-12/+1
| |_|_|/ |/| | |
* | | | Merge branch 'fix/redirect_after_sign_in' into 'master'Stan Hu2015-08-141-18/+21
|\ \ \ \
| * | | | Fix redirection after sign in when using auto_sign_in_with_providerAlex Lossent2015-08-121-18/+21
* | | | | Merge pull request #9528 from revaret/Fixed_alignment_issueStan Hu2015-08-141-1/+12
|\ \ \ \ \
| * | | | | Fixed #9527ranjith2015-08-131-1/+12
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-08-141-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'Dmitriy Zaporozhets2015-08-141-1/+1
| |\ \ \ \ \ \
| | * | | | | | Disable internal issue tracker if external tracker in useStan Hu2015-07-171-1/+1
* | | | | | | | Update Flowdock integration to support new Flowdock APIBoyan Tabakov2015-08-141-1/+1
|/ / / / / / /
* | | | | | | Set max-width for README, issue and merge request descriptionDmitriy Zaporozhets2015-08-143-0/+10
* | | | | | | Fix: User search feature in admin area does not respect filtersrespect_filtersValery Sizov2015-08-131-0/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'improve-hipchat-service-test' into 'master'Dmitriy Zaporozhets2015-08-133-3/+22
|\ \ \ \ \ \
| * | | | | | Provide more feedback what went wrong if HipChat service failed testStan Hu2015-08-123-3/+22
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'bring-clonebar-back' into 'master'Dmitriy Zaporozhets2015-08-132-10/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bring clone bar backStan Hu2015-08-122-10/+0