summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '42800-change-usage-of-avatar_icon' into 'master'Yorick Peterse2018-02-1431-45/+71
|\
| * Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_iconAndreas Brandl2018-02-133-16/+16
| * Always eagerly load a note's author.Andreas Brandl2018-02-131-1/+1
| * Always eagerly load an issue's author.Andreas Brandl2018-02-131-1/+1
| * Extract method to improve readability.Andreas Brandl2018-02-131-7/+11
| * Remove generic #avatar_icon helper.Andreas Brandl2018-02-131-8/+0
| * Explicit use of avatar_icon_* calls depending on situation.Andreas Brandl2018-02-133-5/+25
| * Use avatar_icon_for_email for commits.Andreas Brandl2018-02-132-2/+2
| * Retrieve project creator's avatar by creator, not creator#email.Andreas Brandl2018-02-131-1/+1
| * Retrieve namespace owner's avatar by owner, not owner#email.Andreas Brandl2018-02-131-1/+1
| * Retrieve issue author's avatar by user, not user#email.Andreas Brandl2018-02-131-1/+1
| * Use more specific #avatar_icon_for_email.Andreas Brandl2018-02-133-3/+3
| * Use more specific #avatar_icon_for_user.Andreas Brandl2018-02-1320-22/+22
| * Refactor and split ApplicationHelper#avatar_icon.Andreas Brandl2018-02-131-7/+17
* | Merge branch '38135-remove-ignore-column-from-events' into 'master'Yorick Peterse2018-02-141-4/+0
|\ \
| * | Remove ignore_column from Events#data.38135-remove-ignore-column-from-eventsAndreas Brandl2018-02-131-4/+0
* | | Merge branch 'expired-ci-artifacts' into 'master'Grzegorz Bizon2018-02-141-4/+33
|\ \ \
| * | | revert to earlier coding using a hard coded UNION ALL instead of Gitlab::SQL:...expired-ci-artifactsGreg Stark2018-02-091-6/+3
| * | | add rubocop whitelistGreg Stark2018-02-091-3/+3
| * | | Revert to old code style where branches of the union do not have extra where ...Greg Stark2018-02-091-18/+12
| * | | WIP experimentGreg Stark2018-02-091-3/+9
| * | | Add indexes and change SQL for expired artifacts to deal with artifacts migra...Greg Stark2018-02-081-4/+36
* | | | Merge branch 'fix/template-project-visibility' into 'master'Douwe Maan2018-02-142-11/+13
|\ \ \ \
| * | | | Update projects import serviceGeorge Tsiolis2018-02-122-11/+13
* | | | | Resolve "Remove notification settings for groups and projects you were previo...🙈 jacopo beschi 🙉2018-02-142-1/+2
* | | | | Merge branch '42934-search-api-fix' into 'master'Sean McGivern2018-02-141-0/+4
|\ \ \ \ \
| * | | | | API - Include project in commits&blobs search resultsJarka Kadlecová2018-02-141-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch '37050-ext-issue-tracker' into 'master'Sean McGivern2018-02-143-0/+19
|\ \ \ \ \
| * | | | | Display a link to external issue tracker when enabledJarka Kadlecová2018-02-143-0/+19
* | | | | | Merge branch '42314-diff-file' into 'master'Douwe Maan2018-02-141-1/+1
|\ \ \ \ \ \
| * | | | | | Render modified icon for moved file42314-diff-fileFilipa Lacerda2018-02-131-1/+1
* | | | | | | Merge branch 'remove-unused-code-profile' into 'master'Jacob Schatz2018-02-131-18/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unused coderemove-unused-code-profileClement Ho2018-02-081-18/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '43198-fix-settings-panel-expanding-when-fragment-hash-linked' i...Phil Hughes2018-02-131-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix settings panel not expanding when fragment hash linkedEric Eastwood2018-02-131-1/+1
* | | | | | | Merge branch 'fix/remove-allow-n-plus-1-from-network-graph' into 'master'Robert Speicher2018-02-131-5/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove allow_n_plus_1 block from Network::Graphfix/remove-allow-n-plus-1-from-network-graphAhmad Sherif2018-02-131-5/+2
* | | | | | | | Merge branch 'fix/remove-allow-n-plus-1-from-delete-merged-branches-service' ...Robert Speicher2018-02-131-11/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove allow_n_plus_1 block from DeleteMergedBranchesServicefix/remove-allow-n-plus-1-from-delete-merged-branches-serviceAhmad Sherif2018-02-121-11/+7
* | | | | | | | | Merge branch '42580-fix-lock-mr-hover-on-edit' into 'master'Phil Hughes2018-02-132-3/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Make Edit link style consistent on Sidebar42580-fix-lock-mr-hover-on-editAndré Luís2018-02-132-3/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '26466-natural-sort-mrs' into 'master'Sean McGivern2018-02-132-2/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Change issue show page to group MRs by projects and namespacesJeff Stubler2018-02-132-2/+13
* | | | | | | | Merge branch '42923-close-issue' into 'master'Phil Hughes2018-02-1310-49/+142
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | [ci skip] Merge branch 'master' into 42923-close-issueFilipa Lacerda2018-02-1322-150/+134
| |\ \ \ \ \ \ \
| * | | | | | | | Reuse getter42923-close-issueFilipa Lacerda2018-02-124-20/+35
| * | | | | | | | [ci skip] Merge branch 'master' into 42923-close-issueFilipa Lacerda2018-02-1221-167/+182
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Put back class names used in shared testFilipa Lacerda2018-02-121-0/+2
| * | | | | | | | | Makes close/reopen issue request to inside the vue appFilipa Lacerda2018-02-099-40/+116
* | | | | | | | | | Merge branch 'sh-fix-issue-43193' into 'master'Sean McGivern2018-02-131-3/+5
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status