summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "fixed monaco height"Jacob Schatz2017-08-022-2/+2
* Revert "Add experimental flex css."Jacob Schatz2017-08-021-10/+3
* move edit button to its own view model abstract objectLuke "Jared" Bennett2017-08-025-45/+48
* Move monaco loader init function to its own helper and moved repo vm init to ...Luke "Jared" Bennett2017-08-023-73/+101
* Reorganise repo/ files to match guidelinesLuke "Jared" Bennett2017-08-0229-55/+55
* fixed monaco heightPhil Hughes2017-08-022-2/+3
* Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ideJacob Schatz2017-08-029-35/+101
|\
| * Fix eslintLuke "Jared" Bennett2017-08-021-2/+4
| * Remove fdescribesLuke "Jared" Bennett2017-08-021-1/+1
| * [ci skip] Improved repo_file_specLuke "Jared" Bennett2017-08-023-3/+22
| * [ci skip] Remove lock from ceLuke "Jared" Bennett2017-08-024-5/+3
| * [ci skip] Add missing :key attrsLuke "Jared" Bennett2017-08-022-4/+4
| * [ci skip] Improve repo_commit_section_specLuke "Jared" Bennett2017-08-022-7/+18
| * [ci skip] Improve repo_binary_viewer_specLuke "Jared" Bennett2017-08-022-19/+56
| * [ci skip] Remove console from loadingErrorLuke "Jared" Bennett2017-08-021-2/+1
* | Add experimental flex css.Jacob Schatz2017-08-021-3/+9
|/
* Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ideJacob Schatz2017-08-017-23/+22
|\
| * eslint-fixLuke "Jared" Bennett2017-08-011-7/+5
| * Fix eslint offensesLuke "Jared" Bennett2017-08-017-16/+17
* | Fix initial not syntax highlighting.Jacob Schatz2017-08-012-9/+6
|/
* Fix UselessAssignment offense in projects_controllerLuke "Jared" Bennett2017-08-011-1/+0
* Fix rubocopLuke "Jared" Bennett2017-08-011-2/+2
* Fix scss_lintLuke "Jared" Bennett2017-08-011-2/+5
* Fix haml_lintLuke "Jared" Bennett2017-08-011-1/+1
* [ci skip] eslint-fixLuke "Jared" Bennett2017-08-0111-45/+40
* Fixed repo_commit_section_specLuke "Jared" Bennett2017-08-011-19/+7
* [ci skip] Fix repo_binary_viewer_specLuke "Jared" Bennett2017-08-011-1/+1
* Fix monaco_loader_specLuke "Jared" Bennett2017-08-011-4/+13
* Fix BlobViewer instatiation in dispatcherLuke "Jared" Bennett2017-08-011-1/+1
* Correct target_switcher conditionalLuke "Jared" Bennett2017-07-311-1/+1
* Only show target dropdown if new_repoLuke "Jared" Bennett2017-07-311-2/+3
* Move tree_content inline js to old_tree_contentLuke "Jared" Bennett2017-07-312-7/+6
* Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-31135-431/+1260
|\
| * Merge branch 'avoid-expect_any_instance_of' into 'master'Rémy Coutable2017-07-311-9/+13
| |\
| | * Avoid expect_any_instance_of because it doesn't workavoid-expect_any_instance_ofLin Jen-Shin2017-07-311-9/+13
| * | Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master'Kamil Trzciński2017-07-317-53/+94
| |\ \
| | * | Improve wording related to deploy chatops commandfix/gb/fix-chatops-deploy-multiple-actions-matchingGrzegorz Bizon2017-07-285-7/+7
| | * | Update docs regarding deploy chatops slash commandGrzegorz Bizon2017-07-281-1/+20
| | * | Add changelog entry for deploy chatops command fixGrzegorz Bizon2017-07-281-0/+4
| | * | Improve deploy environment chatops slash commandGrzegorz Bizon2017-07-284-51/+69
| * | | Merge branch 'add-regressions-explanation' into 'master'Douwe Maan2017-07-311-1/+19
| |\ \ \
| | * | | Explain what the regression label meansadd-regressions-explanationSean McGivern2017-07-311-1/+19
| | | |/ | | |/|
| * | | Merge branch '29385/add_shrug_command' into 'master'Rémy Coutable2017-07-319-7/+225
| |\ \ \
| | * | | Fixes #29385: Add /shrug and /tableflip commandsAlex Ives2017-07-289-7/+225
| * | | | Merge branch '35482-dropdown' into 'master'Annabel Dunstone Gray2017-07-311-4/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | fix :focus styles for selected filter dropdown items35482-dropdownSimon Knox2017-07-251-4/+4
| * | | | Merge branch 'win-newnav-badges-firefox' into 'master'Phil Hughes2017-07-312-3/+3
| |\ \ \ \
| | * | | | Fix badge positioning in new navigation for Firefoxwin-newnav-badges-firefoxwinh2017-07-312-3/+3
| * | | | | Merge branch '34679-enhance-pt-br' into 'master'Rémy Coutable2017-07-311-7/+7
| |\ \ \ \ \
| | * | | | | Enhance pt-BR translation in Project and Repository pagesPaulo Bezerra2017-07-251-7/+7