summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Re added The Web IDE ButtonTim Zallmann2018-03-281-43/+54
* Fixes for Tests on file.js and tabs testsTim Zallmann2018-03-281-23/+20
* Fix for MR Widget Header resetTim Zallmann2018-03-281-43/+43
* Fixes to Formatting to all FilesTim Zallmann2018-03-2814-202/+32
* ESLint + Karma fixesTim Zallmann2018-03-286-82/+26
* Fixed new AdditionsTim Zallmann2018-03-287-11/+15
* Actual MR diff displayedTim Zallmann2018-03-2816-339/+195
* Basic Setup for MR ShowingTim Zallmann2018-03-2823-314/+1006
* Merge branch 'refactor/move-time-tracking-comparison-pane-vue-component' into...Filipa Lacerda2018-03-282-38/+42
|\
| * Move TimeTrackingComparisonPane vue componentGeorge Tsiolis2018-03-222-38/+42
* | Merge branch 'dz-improve-app-settings-2' into 'master'Filipa Lacerda2018-03-285-134/+176
|\ \
| * | Move ci/cd, influx and prometheus app settings to expandable sectionsDmitriy Zaporozhets2018-03-275-134/+176
* | | Remove some easy cases of 'path_to_repo' useJacob Vosmaer (GitLab)2018-03-285-12/+14
* | | Merge branch '43952-use-a-better-link-for-documentation-on-existing-cluster-c...Filipa Lacerda2018-03-281-1/+1
|\ \ \
| * | | Add anchor43952-use-a-better-link-for-documentation-on-existing-cluster-creation-formFabio Busatto2018-03-271-1/+1
* | | | Merge branch '27210-add-cancel-btn-to-new-page-domain' into 'master'Filipa Lacerda2018-03-281-0/+2
|\ \ \ \
| * | | | Adds cancel btn to new pages domain pageJacopo2018-03-271-0/+2
| | |/ / | |/| |
* | | | Merge branch 'ide-wordwrap' into 'master'Tim Zallmann2018-03-281-0/+1
|\ \ \ \
| * | | | Enable word wrap in IDEPhil Hughes2018-03-271-0/+1
* | | | | Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-2812-67/+89
|\ \ \ \ \
| * | | | | Changes ci/lints controller to use authorize before actionMayra Cabrera2018-03-261-5/+1
| * | | | | Remove unused css classMayra Cabrera2018-03-261-1/+1
| * | | | | Removes lint scss fileMayra Cabrera2018-03-261-3/+0
| * | | | | Change ci/lint page to use a template structureMayra Cabrera2018-03-264-21/+9
| * | | | | Build ci/lint pageMayra Cabrera2018-03-265-28/+44
| * | | | | Make ci/lint page context aware:Mayra Cabrera2018-03-269-41/+66
* | | | | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-283-32/+120
|\ \ \ \ \ \
| * | | | | | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-273-32/+120
| | |/ / / / | |/| | | |
* | | | | | Clean up monitoring componentsMike Greiling2018-03-278-741/+708
* | | | | | Merge branch 'update-unresolved-discussions-vue-component' into 'master'Clement Ho2018-03-271-2/+2
|\ \ \ \ \ \
| * | | | | | Add i18n and update specs for ShaMismatch vue componentGeorge Tsiolis2018-03-271-2/+2
* | | | | | | [FIX] Fixed bug in dropdown selector when selecting the same selection againbitsapien2018-03-271-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'reduce-query-count-for-mergerequestscontroller-show' into 'master'Douwe Maan2018-03-271-10/+17
|\ \ \ \ \ \
| * | | | | | Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-showSean McGivern2018-03-211-10/+17
* | | | | | | Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-278-18/+56
|\ \ \ \ \ \ \
| * | | | | | | Revert exploratory branch restriction policyjej/add-protected-branch-policyJames Edwards-Jones2018-03-261-10/+0
| * | | | | | | ProtectedBranchPolicy used from Controller for destroy/updateJames Edwards-Jones2018-03-263-4/+19
| * | | | | | | DestroyService for protected tags/branches used from controllerJames Edwards-Jones2018-03-265-13/+31
| * | | | | | | Branch unprotection restriction starting pointJames Edwards-Jones2018-03-262-1/+16
* | | | | | | | Merge branch 'ide-ui-theme' into 'master'Tim Zallmann2018-03-272-34/+93
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Added web IDE to GitLab theme definitionide-ui-themePhil Hughes2018-03-232-34/+93
* | | | | | | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich2018-03-273-7/+13
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into 'ma...Kamil Trzciński2018-03-272-7/+17
|\ \ \ \ \ \ \
| * | | | | | | Re-arrange deployment_platform to avoid cop complainments5347-fix-multiple-clusters-incorrect-details-injectedMayra Cabrera2018-03-261-4/+10
| * | | | | | | Rearrange DeploymentPlatform methodsMayra Cabrera2018-03-222-4/+8
* | | | | | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-2731-104/+812
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | personal snippets will now comply with `background_upload`Micaël Bergeron2018-03-262-1/+6
| * | | | | | | fix the failing specsMicaël Bergeron2018-03-221-1/+2
| * | | | | | | remove EE-only codeMicaël Bergeron2018-03-221-2/+0
| * | | | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-22510-3294/+9259
| |\ \ \ \ \ \ \
View Lorry Controller Status