summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove-sidebar-bundle' into 'master'Jacob Schatz2018-02-276-7/+12
|\
| * Merge branch 'master' into remove-sidebar-bundleremove-sidebar-bundleClement Ho2018-02-233-3/+4
| |\
| * | Remove sidebar bundle webpack entry pointClement Ho2018-02-236-7/+12
* | | Merge branch 'rc/reduce-delta-with-ce-in-controllers-ce' into 'master'Douwe Maan2018-02-2717-231/+197
|\ \ \
| * | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-2715-149/+112
| * | | Move the #update action from Project/Member controllers to the MembershipActi...Rémy Coutable2018-02-276-24/+16
| * | | Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-2712-104/+115
* | | | Merge branch '24774-clear-the-Labels-dropdown-search-filter' into 'master'Phil Hughes2018-02-271-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Clear "Labels" dropdown search filter after selectionKushal Pandya2018-02-271-0/+6
* | | | Merge branch '43304-simplify-filtering-non-human-users' into 'master'Yorick Peterse2018-02-271-1/+1
|\ \ \ \
| * | | | Simplify filtering of non-human users (like ghosts).43304-simplify-filtering-non-human-usersAndreas Brandl2018-02-261-1/+1
* | | | | Merge branch 'refactor-commit-show' into 'master'Phil Hughes2018-02-272-1/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'refactor-commit-show'refactor-commit-showPhil Hughes2018-02-2713-17/+24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into refactor-commit-showClement Ho2018-02-2625-267/+187
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Remove diff notes webpack entry pointClement Ho2018-02-262-1/+2
* | | | | | | Merge branch 'ph-webpack-bundle-tags' into 'master'Filipa Lacerda2018-02-2710-31/+25
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tagsPhil Hughes2018-02-2744-323/+253
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Converted webpack_bundle_tag to be automatic webpack bundlesPhil Hughes2018-02-2610-31/+25
* | | | | | | | Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' i...Grzegorz Bizon2018-02-276-17/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroupsSean McGivern2018-02-276-17/+20
* | | | | | | | | Merge branch 'slash-commands-changes-for-chatops' into 'master'Kamil Trzciński2018-02-273-5/+26
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Expose ChatName objects to slash commandsslash-commands-changes-for-chatopsYorick Peterse2018-02-233-5/+26
* | | | | | | | | Merge branch 'refactor-pipelines-list' into 'master'Phil Hughes2018-02-275-3/+8
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-listClement Ho2018-02-2625-267/+187
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Remove commit_pipelines webpack entry pointClement Ho2018-02-265-3/+8
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '43315-gpg-popover' into 'master'Phil Hughes2018-02-272-9/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing class to parent element and remove extra CSS43315-gpg-popoverFilipa Lacerda2018-02-263-10/+2
| * | | | | | | | | [ci skip] Merge branch 'master' into 43315-gpg-popoverFilipa Lacerda2018-02-2652-233/+728
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix gpg popover boxFilipa Lacerda2018-02-232-6/+6
* | | | | | | | | | | Merge branch '43275-improve-variables-validation-message' into 'master'Kamil Trzciński2018-02-273-2/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Include CI Variable Key in its uniqueness validation error message43275-improve-variables-validation-messageMatija Čupić2018-02-232-2/+8
| * | | | | | | | | | | Skip variables duplicates validator if variable is already a duplicateMatija Čupić2018-02-222-1/+2
| * | | | | | | | | | | Condition associated variable validation in Project and GroupMatija Čupić2018-02-222-2/+3
| * | | | | | | | | | | Do not validate individual Variables when saving Project/GroupMatija Čupić2018-02-222-2/+2
* | | | | | | | | | | | Merge branch 'master' into refactor-environments-folderrefactor-environments-folderClement Ho2018-02-2625-267/+187
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ...Mayra Cabrera2018-02-262-26/+28
| * | | | | | | | | | | Refactor wildcard dispatcher importsClement Ho2018-02-2614-188/+89
| * | | | | | | | | | | Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-266-13/+15
| * | | | | | | | | | | Merge branch 'refactor/move-board-new-issue-vue-component' into 'master'Filipa Lacerda2018-02-263-40/+55
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Move BoardNewIssue vue componentGeorge Tsiolis2018-02-083-40/+55
* | | | | | | | | | | | Remove environments folder webpack entry pointClement Ho2018-02-263-3/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Remove webpack bundle tags for blobJacob Schatz2018-02-261-3/+0
* | | | | | | | | | | Merge branch 'feature/migrate-recursive-tree-entries-fetching' into 'master'Robert Speicher2018-02-261-19/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Migrate recursive tree entries fetching to GitalyAhmad Sherif2018-02-261-19/+1
* | | | | | | | | | | | Allow to find labels in ancestor groups and better group support in label ser...Jan Provaznik2018-02-263-13/+38
* | | | | | | | | | | | Merge branch 'issue-edit-shortcut' into 'master'Filipa Lacerda2018-02-261-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed issue edit shortcut not workingissue-edit-shortcutPhil Hughes2018-02-261-4/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'kp-ce-port-5013-fix-multiple-assignee-avatar-alignment' into 'm...Clement Ho2018-02-261-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix assignee avatar and notes icon alignmentkp-ce-port-5013-fix-multiple-assignee-avatar-alignmentKushal Pandya2018-02-231-1/+11
* | | | | | | | | | | | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into 'ma...Douwe Maan2018-02-265-71/+84
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |