summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge branch 'note-query-information' into 'master'Stan Hu2015-08-121-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | api: add 'system', 'upvote', and 'downvote' fields to note queriesBen Boeckel2015-08-121-0/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'mr-merge-manually-2' into 'master' Dmitriy Zaporozhets2015-08-122-10/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move merge manually text below merge widgetDmitriy Zaporozhets2015-08-112-10/+9
| |/ / /
* | | | Add merged label on branches pageFlorent (HP)2015-08-112-0/+16
|/ / /
* | | Merge branch 'check-out-branch-button' into 'master' Dmitriy Zaporozhets2015-08-112-10/+20
|\ \ \
| * \ \ Merge branch 'master' into check-out-branch-buttoncheck-out-branch-buttonDouwe Maan2015-08-1023-105/+203
| |\ \ \
| * \ \ \ Merge branch 'master' into check-out-branch-buttonDouwe Maan2015-08-0910-22/+51
| |\ \ \ \
| * | | | | Add "Check out branch" button to the MR page.Douwe Maan2015-08-082-10/+20
* | | | | | Merge branch 'mr-widget-text' into 'master' Dmitriy Zaporozhets2015-08-1117-98/+117
* | | | | | Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-111-8/+0
* | | | | | Refactor merge request widgetDmitriy Zaporozhets2015-08-117-117/+86
* | | | | | Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-113-38/+30
* | | | | | Merge branch 'grit_blame' into 'master' Dmitriy Zaporozhets2015-08-114-21/+26
|\ \ \ \ \ \
| * | | | | | Small UI improvements to git blame pageDmitriy Zaporozhets2015-08-113-13/+17
| * | | | | | Fast blameValery Sizov2015-08-112-14/+15
* | | | | | | Merge branch 'drop-username-tree-row' into 'master'Dmitriy Zaporozhets2015-08-111-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Drop the user name from tree row to improve readability of commit messagesSven Strickroth2015-08-091-1/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-08-111-1/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Link username to profile on Group Members pageTom Webster2015-08-101-1/+2
* | | | | | | Merge branch 'revert-satellites' into 'master' Dmitriy Zaporozhets2015-08-1157-707/+576
|\ \ \ \ \ \ \
| * | | | | | | Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets2015-08-112-9/+8
| * | | | | | | Revert "Create and edit files in web editor via rugged"Dmitriy Zaporozhets2015-08-113-81/+14
| * | | | | | | Revert "Fix adding new file to empty repo"Dmitriy Zaporozhets2015-08-111-1/+1
| * | | | | | | Revert "Use rugged in web editor for base64 encoding"Dmitriy Zaporozhets2015-08-112-28/+34
| * | | | | | | Revert "Create activity event and execute hooks on web editor commit"Dmitriy Zaporozhets2015-08-113-11/+3
| * | | | | | | Revert "Make web editor work correctly after switch from satellites"Dmitriy Zaporozhets2015-08-115-7/+5
| * | | | | | | Revert "Refactor web editor"Dmitriy Zaporozhets2015-08-116-120/+152