Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move merge manually text below merge widget | Dmitriy Zaporozhets | 2015-08-11 | 2 | -10/+9 |
* | Merge branch 'check-out-branch-button' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 2 | -10/+20 |
|\ | |||||
| * | Merge branch 'master' into check-out-branch-buttoncheck-out-branch-button | Douwe Maan | 2015-08-10 | 23 | -105/+203 |
| |\ | |||||
| * \ | Merge branch 'master' into check-out-branch-button | Douwe Maan | 2015-08-09 | 10 | -22/+51 |
| |\ \ | |||||
| * | | | Add "Check out branch" button to the MR page. | Douwe Maan | 2015-08-08 | 2 | -10/+20 |
* | | | | Merge branch 'mr-widget-text' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 17 | -98/+117 |
* | | | | Move command line insturction out of mr widget | Dmitriy Zaporozhets | 2015-08-11 | 1 | -8/+0 |
* | | | | Refactor merge request widget | Dmitriy Zaporozhets | 2015-08-11 | 7 | -117/+86 |
* | | | | Move command line insturction out of mr widget | Dmitriy Zaporozhets | 2015-08-11 | 3 | -38/+30 |
* | | | | Merge branch 'grit_blame' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 4 | -21/+26 |
|\ \ \ \ | |||||
| * | | | | Small UI improvements to git blame page | Dmitriy Zaporozhets | 2015-08-11 | 3 | -13/+17 |
| * | | | | Fast blame | Valery Sizov | 2015-08-11 | 2 | -14/+15 |
* | | | | | Merge branch 'drop-username-tree-row' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Drop the user name from tree row to improve readability of commit messages | Sven Strickroth | 2015-08-09 | 1 | -1/+0 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'master' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Link username to profile on Group Members page | Tom Webster | 2015-08-10 | 1 | -1/+2 |
* | | | | | | Merge branch 'revert-satellites' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 57 | -707/+576 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Merge branch 'web-editor-rugged' into 'master'" | Dmitriy Zaporozhets | 2015-08-11 | 2 | -9/+8 |
| * | | | | | | Revert "Create and edit files in web editor via rugged" | Dmitriy Zaporozhets | 2015-08-11 | 3 | -81/+14 |
| * | | | | | | Revert "Fix adding new file to empty repo" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -1/+1 |
| * | | | | | | 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 | 6 | -120/+152 |
| * | | | | | | 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 | 2 | -10/+7 |
| * | | | | | | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 32 | -300/+242 |
| * | | | | | | Revert "Merge branch 'improve-merge-requests' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 11 | -113/+160 |
| * | | | | | | Revert "Merge branch 'mr-widget-text' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 17 | -117/+98 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'fix-broken-code-import' into 'master' | Douwe Maan | 2015-08-11 | 1 | -2/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix broken code import and display error messages if something went wrong wit... | Stan Hu | 2015-08-10 | 1 | -2/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'disable-turbolinks-for-bitbucket' into 'master' | Douwe Maan | 2015-08-11 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Disable turbolinks when linking to Bitbucket import status | Stan Hu | 2015-08-10 | 2 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | 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 |
* | | | | | | Fix instructions for empty repo + existing files | Jeff Blaine | 2015-08-10 | 1 | -0/+2 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'mr-widget-text' into 'master' 8-0-development | Dmitriy Zaporozhets | 2015-08-10 | 17 | -98/+117 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 10 | -22/+51 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | 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 | 1 | -26/+29 |
| * | | | | | Improve MR merge widget text and UI consistency. | Douwe Maan | 2015-08-08 | 15 | -69/+78 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'trigger-hooks' into 'master' | Dmitriy Zaporozhets | 2015-08-10 | 2 | -3/+66 |
|\ \ \ \ \ | |||||
| * | | | | | Refactor Trigger post-receive hooks after commits are made by GitLab | Dmitriy Zaporozhets | 2015-08-10 | 1 | -11/+11 |
| * | | | | | Trigger post-receive hoooks when commits are made by GitLabtrigger-hooks | Dmitriy Zaporozhets | 2015-08-10 | 2 | -2/+65 |
* | | | | | | Merge branch 'fix-event-cache' into 'master' | Dmitriy Zaporozhets | 2015-08-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix event cachefix-event-cache | Douwe Maan | 2015-08-10 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dropzone-upload-progress' into 'master' | Stan Hu | 2015-08-10 | 2 | -1/+17 |
|\ \ \ \ \ | |_|/ / / |/| | | | |