summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Delete confidential issue todos for guestsFelipe Artur2018-12-147-11/+25
* Merge branch '7788_parse_license_management_reports_in_be-ce' into 'master'Kamil Trzciński2018-12-114-43/+66
|\
| * Generalise test compare serviceGilbert Roulot2018-12-114-43/+66
* | Merge branch 'gt-remove-unnecessary-line-before-reply-holder' into 'master'Fatih Acet2018-12-114-47/+20
|\ \
| * | Remove boxes around code commentsAnnabel Dunstone Gray2018-12-105-38/+15
| * | Restore top margin for active discussion notesGeorge Tsiolis2018-12-101-1/+0
| * | Restore diff-file discussion paddingGeorge Tsiolis2018-12-101-0/+1
| * | Fix discussion reply holder paddingGeorge Tsiolis2018-12-103-14/+6
| * | Remove unnecessary line before reply holderGeorge Tsiolis2018-12-102-4/+8
* | | Merge branch 'gt-remove-deprecated-vlink-class' into 'master'Fatih Acet2018-12-116-6/+6
|\ \ \
| * | | Remove deprecated `vlink` classGeorge Tsiolis2018-12-106-6/+6
| |/ /
* | | Merge branch 'winh-emoji-menu-jest' into 'master'Kushal Pandya2018-12-111-0/+1
|\ \ \
| * | | Move emoji_menu_spec.js to JestWinnie Hellmann2018-12-111-0/+1
* | | | Merge branch 'qa-project-ui-updates' into 'master'Rémy Coutable2018-12-113-6/+6
|\ \ \ \
| * | | | Update tests and Resources to use new file buttonMark Lapierre2018-12-102-3/+3
| * | | | Update E2E tests for Project overview UI changesMark Lapierre2018-12-101-3/+3
* | | | | Merge branch 'more-kubernetes-logs' into 'master'Dmitriy Zaporozhets2018-12-112-0/+29
|\ \ \ \ \
| * | | | | Minor refactor to GCP service classesMayra Cabrera2018-12-102-8/+23
| * | | | | Add more structured JSON logging to Kubernetes classesDylan Griffith2018-12-102-0/+14
* | | | | | Merge branch 'sh-fix-github-import-without-oauth2-config' into 'master'Rémy Coutable2018-12-111-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Allow GitHub imports via token even if OAuth2 provider not configuredStan Hu2018-12-101-1/+1
| | |/ / / | |/| | |
* | | | | Make commit IDs in merge request discussion header monospaceWinnie Hellmann2018-12-111-1/+5
* | | | | Merge branch 'fix-n-plus-1-queries-projects' into 'master'Douwe Maan2018-12-117-6/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Reduce N+1 from Activity Dashboard and BanzaiGabriel Mazetto2018-12-104-3/+7
| * | | | Remove STI #becomes call from Dashboard indexGabriel Mazetto2018-12-101-1/+1
| * | | | Eager-load relations for Explore::ProjectsControllerGabriel Mazetto2018-12-101-1/+1
| * | | | Eager-load relations for Dashboard::ProjectsControllerGabriel Mazetto2018-12-101-1/+1
| |/ / /
* | | | Merge branch 'sh-revert-mr-22911' into 'master'Grzegorz Bizon2018-12-111-0/+1
|\ \ \ \
| * | | | Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'm...Stan Hu2018-12-101-0/+1
* | | | | Merge branch '55138-fix-mr-discussions-count' into 'master'Phil Hughes2018-12-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix MR discussion counts being offPaul Slaughter2018-12-101-1/+1
* | | | | Merge branch 'ichernikov/add-asignee-to-mr' into 'master'Mark Lapierre2018-12-102-2/+2
|\ \ \ \ \
| * | | | | Extended MR spec to set assigneeichernikov-add-assignee-to-mrievgenChernikov2018-12-102-2/+2
* | | | | | Merge branch 'sh-json-serialize-broadcast-messages' into 'master'Robert Speicher2018-12-101-3/+39
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Avoid caching BroadcastMessage as an ActiveRecord objectStan Hu2018-12-081-3/+39
* | | | | | Merge branch 'profile-fixing' into 'master'Annabel Dunstone Gray2018-12-102-8/+11
|\ \ \ \ \ \
| * | | | | | Add bottom margin depends on profile tabs visibility.Harry Kiselev2018-12-102-2/+6
| * | | | | | Remove unnecessary paddings at profile user bio block.Harry Kiselev2018-12-101-1/+0
| * | | | | | Fix profile_header bottom margin, #51807.Harry Kiselev2018-12-102-6/+6
* | | | | | | Merge branch '49713-main-navbar-is-broken-in-certain-viewport-widths' into 'm...Annabel Dunstone Gray2018-12-105-20/+29
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Resolve main nav clipping in certain breakpointsDennis Tang2018-12-105-20/+29
* | | | | | | Merge branch 'sh-remove-gitlab-shell-include' into 'master'Rémy Coutable2018-12-107-7/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove unnecessary includes of ShellAdapterStan Hu2018-12-057-7/+2
* | | | | | | Merge branch 'backport-ee-helper-changes' into 'master'Robert Speicher2018-12-102-0/+14
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Backport some EE helper changesYorick Peterse2018-12-062-0/+14
* | | | | | | Merge branch '55104-frozenerror-can-t-modify-frozen-string' into 'master'Douwe Maan2018-12-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix a frozen string error in app/mailers/notify.rbRémy Coutable2018-12-101-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Adjust dropdown item and header padding to comply with design specsWinnie Hellmann2018-12-104-20/+9
* | | | | | | Merge branch '55090-fix-group-clusters-no-project-namespace' into 'master'Kamil Trzciński2018-12-102-6/+27
|\ \ \ \ \ \ \
| * | | | | | | Extract Clusters::BuildServiceDylan Griffith2018-12-102-21/+27