Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 100 | -1670/+844 |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-08-11 | 107 | -879/+1712 |
|\ | |||||
| * | Merge branch 'revert-satellites' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 100 | -844/+1670 |
| |\ | |||||
| | * | Fix file api tests | Dmitriy Zaporozhets | 2015-08-11 | 1 | -22/+8 |
| | * | Revert "Fix editing files via API" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -26/+24 |
| | * | Revert "Merge branch 'web-editor-rugged' into 'master'" | Dmitriy Zaporozhets | 2015-08-11 | 7 | -13/+266 |
| | * | Fix gemfilerevert-satellites | Dmitriy Zaporozhets | 2015-08-11 | 1 | -12/+0 |
| | * | Revert "Create and edit files in web editor via rugged" | Dmitriy Zaporozhets | 2015-08-11 | 4 | -81/+18 |
| | * | Revert "Fix adding new file to empty repo" | Dmitriy Zaporozhets | 2015-08-11 | 2 | -1/+5 |
| | * | Revert "Use rugged in web editor for base64 encoding" | Dmitriy Zaporozhets | 2015-08-11 | 2 | -28/+34 |
| | * | Revert "Create activity event and execute hooks on web editor commit" | Dmitriy Zaporozhets | 2015-08-11 | 3 | -11/+3 |
| | * | Revert "Make web editor work correctly after switch from satellites" | Dmitriy Zaporozhets | 2015-08-11 | 5 | -7/+5 |
| | * | Revert "Refactor web editor" | Dmitriy Zaporozhets | 2015-08-11 | 7 | -120/+156 |
| | * | Remove changelog items | Dmitriy Zaporozhets | 2015-08-11 | 1 | -2/+0 |
| | * | Fix conflict issue | Dmitriy Zaporozhets | 2015-08-11 | 1 | -2/+0 |
| | * | Revert "Merge branches inside one repository using rugged instead of satellites" | Dmitriy Zaporozhets | 2015-08-11 | 3 | -62/+6 |
| | * | Revert "Merge branch 'refactor-can-be-merge' into 'master'" | Dmitriy Zaporozhets | 2015-08-11 | 3 | -24/+7 |
| | * | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 67 | -349/+1069 |
| | * | Revert "Merge branch 'improve-merge-requests' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 13 | -154/+160 |
| | * | Revert "Merge branch 'mr-widget-text' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 18 | -119/+98 |
| * | | Merge branch 'fix-broken-code-import' into 'master' | Douwe Maan | 2015-08-11 | 2 | -2/+7 |
| |\ \ | |||||
| | * | | Fix broken code import and display error messages if something went wrong wit... | Stan Hu | 2015-08-10 | 2 | -2/+7 |
| * | | | Merge branch 'disable-turbolinks-for-bitbucket' into 'master' | Douwe Maan | 2015-08-11 | 3 | -2/+3 |
| |\ \ \ | |||||
| | * | | | Disable turbolinks when linking to Bitbucket import status | Stan Hu | 2015-08-10 | 3 | -2/+3 |
| | |/ / | |||||
| * | | | Merge branch 'add-readme-for-activity-feed-setting' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 2 | -30/+29 |
| |\ \ \ | |||||
| | * | | | Add README to list of files in project page if activity feed setting in use | Stan Hu | 2015-08-10 | 2 | -30/+29 |
| * | | | | Merge branch 'doc-link-fix' into 'master' | Achilleas Pipinellis | 2015-08-11 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Doc: Fix link to gravatar.com | Jan Tojnar | 2015-08-10 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'gitdocfix' into 'master' | Achilleas Pipinellis | 2015-08-10 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | Fix instructions for empty repo + existing files | Jeff Blaine | 2015-08-10 | 1 | -0/+2 |
| |/ / / / | |||||
| * | | | | Database size | Sytse Sijbrandij (admin) | 2015-08-10 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-08-11 | 8 | -25/+78 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'update-changelog' into 'master' | Stan Hu | 2015-08-10 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | Add dropzone upload progress to CHANGELOG | Nikita Verkhovin | 2015-08-10 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge branch 'fix-diff-highlighting' into 'master' | Douwe Maan | 2015-08-10 | 3 | -21/+38 |
| |\ \ \ | |||||
| | * | | | Fix diff syntax highlighting | Stan Hu | 2015-08-10 | 3 | -21/+38 |
| | |/ / | |||||
| * | | | Merge branch 'disable-autocrlf-for-binary-files' into 'master' | Stan Hu | 2015-08-10 | 5 | -4/+39 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fix corrupted binary files when using API files endpoint | Stan Hu | 2015-08-09 | 5 | -4/+39 |
* | | | | Merge branch 'notifications' into 'master' | Job van der Voort | 2015-08-11 | 1 | -1/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fixed conflict | karen Carias | 2015-08-10 | 1 | -10/+1 |
| * | | | fixed conflict and comment | karen Carias | 2015-08-10 | 1 | -1/+1 |
| * | | | fixed conflict and comment | karen Carias | 2015-08-10 | 55 | -185/+423 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge branch 'mr-widget-text' into 'master' 8-0-development | Dmitriy Zaporozhets | 2015-08-10 | 18 | -98/+119 |
|\ \ \ \ | |||||
| * | | | | More textual tweaksmr-widget-text | Douwe Maan | 2015-08-09 | 3 | -5/+6 |
| * | | | | Merge branch 'master' into mr-widget-text | Douwe Maan | 2015-08-09 | 11 | -22/+52 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Make modal narrower | Douwe Maan | 2015-08-09 | 1 | -0/+4 |
| * | | | | Tweak MR widget text some more. | Douwe Maan | 2015-08-08 | 3 | -3/+5 |
| * | | | | Improve text in MR "How To Merge" modal. | Douwe Maan | 2015-08-08 | 2 | -26/+30 |
| * | | | | Improve MR merge widget text and UI consistency. | Douwe Maan | 2015-08-08 | 16 | -69/+79 |
* | | | | | Merge branch 'trigger-hooks' into 'master' | Dmitriy Zaporozhets | 2015-08-10 | 2 | -3/+66 |
|\ \ \ \ \ |