summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-11100-1670/+844
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-11107-879/+1712
|\
| * Merge branch 'revert-satellites' into 'master' Dmitriy Zaporozhets2015-08-11100-844/+1670
| |\
| | * Fix file api testsDmitriy Zaporozhets2015-08-111-22/+8
| | * Revert "Fix editing files via API"Dmitriy Zaporozhets2015-08-111-26/+24
| | * Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets2015-08-117-13/+266
| | * Fix gemfilerevert-satellitesDmitriy Zaporozhets2015-08-111-12/+0
| | * Revert "Create and edit files in web editor via rugged"Dmitriy Zaporozhets2015-08-114-81/+18
| | * Revert "Fix adding new file to empty repo"Dmitriy Zaporozhets2015-08-112-1/+5
| | * 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-117-120/+156
| | * Remove changelog itemsDmitriy Zaporozhets2015-08-111-2/+0
| | * Fix conflict issueDmitriy Zaporozhets2015-08-111-2/+0
| | * Revert "Merge branches inside one repository using rugged instead of satellites"Dmitriy Zaporozhets2015-08-113-62/+6
| | * Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-113-24/+7
| | * Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-1167-349/+1069
| | * Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-1113-154/+160
| | * Revert "Merge branch 'mr-widget-text' into 'master' "Dmitriy Zaporozhets2015-08-1118-119/+98
| * | Merge branch 'fix-broken-code-import' into 'master'Douwe Maan2015-08-112-2/+7
| |\ \
| | * | Fix broken code import and display error messages if something went wrong wit...Stan Hu2015-08-102-2/+7
| * | | Merge branch 'disable-turbolinks-for-bitbucket' into 'master'Douwe Maan2015-08-113-2/+3
| |\ \ \
| | * | | Disable turbolinks when linking to Bitbucket import statusStan Hu2015-08-103-2/+3
| | |/ /
| * | | Merge branch 'add-readme-for-activity-feed-setting' into 'master'Dmitriy Zaporozhets2015-08-112-30/+29
| |\ \ \
| | * | | Add README to list of files in project page if activity feed setting in useStan Hu2015-08-102-30/+29
| * | | | Merge branch 'doc-link-fix' into 'master'Achilleas Pipinellis2015-08-111-1/+1
| |\ \ \ \
| | * | | | Doc: Fix link to gravatar.comJan Tojnar2015-08-101-1/+1
| |/ / / /
| * | | | Merge branch 'gitdocfix' into 'master'Achilleas Pipinellis2015-08-101-0/+2
| |\ \ \ \
| | * | | | Fix instructions for empty repo + existing filesJeff Blaine2015-08-101-0/+2
| |/ / / /
| * | | | Database sizeSytse Sijbrandij (admin)2015-08-101-2/+2
| | |/ / | |/| |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-118-25/+78
|\ \ \ \ | |/ / /
| * | | Merge branch 'update-changelog' into 'master'Stan Hu2015-08-101-0/+1
| |\ \ \
| | * | | Add dropzone upload progress to CHANGELOGNikita Verkhovin2015-08-101-0/+1
| |/ / /
| * | | Merge branch 'fix-diff-highlighting' into 'master'Douwe Maan2015-08-103-21/+38
| |\ \ \
| | * | | Fix diff syntax highlightingStan Hu2015-08-103-21/+38
| | |/ /
| * | | Merge branch 'disable-autocrlf-for-binary-files' into 'master'Stan Hu2015-08-105-4/+39
| |\ \ \ | | |_|/ | |/| |
| | * | Fix corrupted binary files when using API files endpointStan Hu2015-08-095-4/+39
* | | | Merge branch 'notifications' into 'master' Job van der Voort2015-08-111-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | fixed conflictkaren Carias2015-08-101-10/+1
| * | | fixed conflict and commentkaren Carias2015-08-101-1/+1
| * | | fixed conflict and commentkaren Carias2015-08-1055-185/+423
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'mr-widget-text' into 'master' 8-0-developmentDmitriy Zaporozhets2015-08-1018-98/+119
|\ \ \ \
| * | | | More textual tweaksmr-widget-textDouwe Maan2015-08-093-5/+6
| * | | | Merge branch 'master' into mr-widget-textDouwe Maan2015-08-0911-22/+52
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Make modal narrowerDouwe Maan2015-08-091-0/+4
| * | | | Tweak MR widget text some more.Douwe Maan2015-08-083-3/+5
| * | | | Improve text in MR "How To Merge" modal.Douwe Maan2015-08-082-26/+30
| * | | | Improve MR merge widget text and UI consistency.Douwe Maan2015-08-0816-69/+79
* | | | | Merge branch 'trigger-hooks' into 'master' Dmitriy Zaporozhets2015-08-102-3/+66
|\ \ \ \ \