summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Expand)AuthorAgeFilesLines
* Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-112-0/+2
* Improve filtering issues by label performanceissue_40500Felipe Artur2018-01-052-3/+0
* Merge branch '40871-todo-notification-count-shows-notification-without-having...Douwe Maan2017-12-181-1/+0
|\
| * Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todoSean McGivern2017-12-181-1/+0
* | Backport changes from EELin Jen-Shin2017-12-151-1/+1
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-156-5/+80
|\ \
| * | Enable the performance bar in dev environmentsZeger-Jan van de Weg2017-12-131-0/+1
| * | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-121-0/+11
| * | Add recaptcha_check_if_spammable for issualbes than arent spammablesrecaptcha_check_if_spammable_ce_backportLuke Bennett2017-12-081-2/+8
| * | Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-082-4/+15
| |/
| * Support uploads for groupsJarka Kadlecova2017-12-071-0/+23
| * Resolve "Display member role per project"Mike Greiling2017-12-071-0/+23
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-303-2/+3
|\ \ | |/
| * Minor backport from EEbackport_from_eeValery Sizov2017-11-291-1/+1
| * Create issue and merge request destroy servicesGeorge Andrinopoulos2017-11-251-1/+1
| * Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan2017-11-231-1/+1
| |\
| | * Use latest_merge_request_diff associationSean McGivern2017-11-231-1/+1
| * | Fix link text from group contextJarka Kadlecova2017-11-231-0/+1
| |/
* | Fix a few layout errorLin Jen-Shin2017-11-222-2/+1
* | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-2214-50/+50
* | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-1812-35/+52
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-177-74/+73
|\ \ | |/
| * Make sure NotesActions#noteable returns a Noteable in the update actiondm-notes-actions-noteable-for-updateDouwe Maan2017-11-161-3/+7
| * Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-141-9/+1
| |\
| | * Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forksJames Edwards-Jones2017-11-091-9/+1
| * | Fix Error 500 when pushing LFS objects with a write deploy keyStan Hu2017-11-081-1/+2
| * | Refactor issuables index actionsJarka Kadlecova2017-11-074-57/+59
| |/
| * Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-062-3/+3
* | WIPLin Jen-Shin2017-11-067-16/+19
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-067-23/+164
|\ \ | |/
| * Merge branch 'jk-delete-epic-backport' into 'master'Sean McGivern2017-11-061-3/+6
| |\
| | * Refactor issuable destroy actionJarka Kadlecova2017-11-061-3/+6
| * | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-061-0/+2
| |\ \
| | * | Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
| | * | Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
| | * | Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-211-1/+2
| | * | Added discussion_line_code value to note response and use it to query the rig...Luke "Jared" Bennett2017-10-211-1/+2
| * | | Merge branch 'issue_39176' into 'master'Douwe Maan2017-11-031-1/+2
| |\ \ \
| | * | | Render 404 when polling commit notes without having permissionsissue_39176Felipe Artur2017-11-031-1/+2
| | |/ /
| * | | Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-031-4/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Find the LFS-objects for a fork within a the fork networkBob Van Landuyt2017-11-031-4/+3
| | |/
| * | CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-021-0/+72
| |/
| * Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-171-0/+24
| |\
| | * Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-121-1/+1
| | * Fix spinach featuresBob Van Landuyt2017-10-111-1/+1
| | * Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-101-3/+8
| | |\
| | * | Only expand ancestors when searchingBob Van Landuyt2017-10-091-7/+7
| | * | Load counts everywhere we render a group treeBob Van Landuyt2017-10-051-1/+1
| | * | Make sure all ancestors are loaded when searching groupsBob Van Landuyt2017-10-051-1/+1
| | * | Stylize `GroupTree` concernBob Van Landuyt2017-10-041-2/+2
View Lorry Controller Status