summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Move merge manually text below merge widgetDmitriy Zaporozhets2015-08-112-10/+9
* 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
| * | | | | | 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-112-10/+7
| * | | | | | Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-1132-300/+242
| * | | | | | Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-1111-113/+160
| * | | | | | Revert "Merge branch 'mr-widget-text' into 'master' "Dmitriy Zaporozhets2015-08-1117-117/+98
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-broken-code-import' into 'master'Douwe Maan2015-08-111-2/+6
|\ \ \ \ \ \
| * | | | | | Fix broken code import and display error messages if something went wrong wit...Stan Hu2015-08-101-2/+6
| |/ / / / /
* | | | | | Merge branch 'disable-turbolinks-for-bitbucket' into 'master'Douwe Maan2015-08-112-2/+2
|\ \ \ \ \ \
| * | | | | | Disable turbolinks when linking to Bitbucket import statusStan Hu2015-08-102-2/+2
| |/ / / / /
* | | | | | 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
* | | | | | Fix instructions for empty repo + existing filesJeff Blaine2015-08-101-0/+2
| |/ / / / |/| | | |
* | | | | Merge branch 'mr-widget-text' into 'master' 8-0-developmentDmitriy Zaporozhets2015-08-1017-98/+117
|\ \ \ \ \
| * | | | | More textual tweaksmr-widget-textDouwe Maan2015-08-093-5/+6
| * | | | | Merge branch 'master' into mr-widget-textDouwe Maan2015-08-0910-22/+51
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | 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-081-26/+29
| * | | | | Improve MR merge widget text and UI consistency.Douwe Maan2015-08-0815-69/+78
| | |_|_|/ | |/| | |
* | | | | Merge branch 'trigger-hooks' into 'master' Dmitriy Zaporozhets2015-08-102-3/+66
|\ \ \ \ \
| * | | | | Refactor Trigger post-receive hooks after commits are made by GitLabDmitriy Zaporozhets2015-08-101-11/+11
| * | | | | Trigger post-receive hoooks when commits are made by GitLabtrigger-hooksDmitriy Zaporozhets2015-08-102-2/+65
* | | | | | Merge branch 'fix-event-cache' into 'master' Dmitriy Zaporozhets2015-08-101-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix event cachefix-event-cacheDouwe Maan2015-08-101-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'dropzone-upload-progress' into 'master'Stan Hu2015-08-102-1/+17
|\ \ \ \ \ | |_|/ / / |/| | | |