summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* removed unneeded lint commentsdispatcher-projects-efiSimon Knox2018-01-151-2/+2
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-proj...Simon Knox2018-01-1591-919/+1180
|\
| * Merge branch '16988-use-toggle-for-subscribed-unsubscribed-to-notifications' ...Annabel Dunstone Gray2018-01-128-56/+71
| |\
| | * change loading prop behavior for subscriptions.vueMike Greiling2018-01-122-2/+2
| | * add missing commaMike Greiling2018-01-121-1/+1
| | * only show loading indicator in subscription toggle on initial data fetch16988-use-toggle-for-subscribed-unsubscribed-to-notificationsMike Greiling2018-01-121-1/+1
| | * add tooltip for notifications icon in collapsed sidebarMike Greiling2018-01-121-9/+29
| | * change notification bell icon from font-awesome to gitlab svgMike Greiling2018-01-121-8/+10
| | * update capybara specs for subscription toggleMike Greiling2018-01-122-16/+14
| | * update spinach test for subscription toggleMike Greiling2018-01-122-5/+5
| | * update karma testsMike Greiling2018-01-122-7/+7
| | * add prop defaultsMike Greiling2018-01-122-2/+4
| | * change rss icon to bell icon for notificationsMike Greiling2018-01-111-1/+5
| | * convert notification subscription button into toggleMike Greiling2018-01-113-22/+11
| * | Merge branch 'rename-prometheus-to-monitoring' into 'master'Stan Hu2018-01-121-1/+1
| |\ \
| | * | Rename ~Prometheus to ~MonitoringFabio Busatto2018-01-121-1/+1
| |/ /
| * | Merge branch 'fix_gitlab-ce#41891' into 'master'Annabel Dunstone Gray2018-01-123-3/+13
| |\ \
| | * | remove wrong/unneeded margin of custom navigation header logo without logo textMarkus Doits2018-01-123-3/+13
| * | | Merge branch 'display-mr-in-commit-page' into 'master'Clement Ho2018-01-1215-2/+256
| |\ \ \
| | * | | Display related merge requests in commit detail pageHiroyuki Sato2018-01-1215-2/+256
| |/ / /
| * | | Merge branch 'projects-l' into 'master'Filipa Lacerda2018-01-125-2/+41
| |\ \ \
| | * | | Refactor into init_labelsprojects-lClement Ho2018-01-122-17/+20
| | * | | Merge branch 'master' into projects-lClement Ho2018-01-11222-1462/+2749
| | |\ \ \
| | * | | | Code improvementsClement Ho2018-01-114-11/+8
| | * | | | Refactor projects:l*Jacob Schatz2018-01-114-2/+41
| * | | | | Merge branch '40492-update-admin-dashboard-content-order' into 'master'Annabel Dunstone Gray2018-01-122-28/+33
| |\ \ \ \ \
| | * | | | | Move row containing Projects, Users and Groups count to the topKushal Pandya2018-01-122-28/+33
| |/ / / / /
| * | | | | Merge branch 'ce-backport-generalize-protected-branch-tags-to-create-item-dro...Filipa Lacerda2018-01-128-135/+60
| |\ \ \ \ \
| | * | | | | Generalize protected branch/tag dropdownsce-backport-generalize-protected-branch-tags-to-create-item-dropdownEric Eastwood2018-01-128-135/+60
| * | | | | | Merge branch '41731-predicate-memoization' into 'master'Robert Speicher2018-01-1213-23/+215
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 41731-predicate-memoizationLin Jen-Shin2018-01-1330-649/+348
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch '41807-15665-consistently-502s-because-it-fetches-every-commit' ...41988-updating-the-markdown-cache-version-does-not-flush-the-appearances-cacheRémy Coutable2018-01-125-6/+99
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Only search for MR revert commits on notes after MR was merged41807-15665-consistently-502s-because-it-fetches-every-commitSean McGivern2018-01-125-6/+99
| * | | | | | | Merge branch 'docs-move-article-autoscaling-runner-aws' into 'master'Achilleas Pipinellis2018-01-121-410/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Docs: move article "Autoscaling Runners on AWS" to its topic-related dirMarcia Ramos2018-01-121-410/+1
| |/ / / / / / /
| * | | | | | | Merge branch 'projects-dropdown-perf' into 'master'Filipa Lacerda2018-01-121-5/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed performance of projects dropdownprojects-dropdown-perfPhil Hughes2018-01-121-5/+2
| * | | | | | | | Merge branch 'disable-pages-on-jobs' into 'master'Yorick Peterse2018-01-123-2/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use simple Next/Prev paging for jobs to avoid large count queries on arbitrar...disable-pages-on-jobsGreg Stark2018-01-113-2/+8
| * | | | | | | | | Merge branch 'docs-api-users' into 'master'Achilleas Pipinellis2018-01-121-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update missing API documentation on `GET /users/:id/projects`Onuwa Nnachi Isaac2018-01-121-0/+4
| * | | | | | | | | | Merge branch 'docs-remove-duplicate-ci-examples' into 'master'Achilleas Pipinellis2018-01-123-171/+97
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Docs: remove duplicate CI examplesMarcia Ramos2018-01-123-171/+97
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'gitignore-rej' into 'master'Sean McGivern2018-01-121-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Added .rej files to gitignorePhil Hughes2018-01-121-0/+1
| * | | | | | | | | | Merge branch '41937-vue-prop-type' into 'master'Phil Hughes2018-01-122-9/+31
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix boolean prop being provided as string41937-vue-prop-typeFilipa Lacerda2018-01-112-9/+31
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch '41797-prometheus-wording-fixes' into 'master'Kamil Trzciński2018-01-121-2/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixes minor aspects on Prometheus description41797-prometheus-wording-fixesMayra Cabrera2018-01-111-2/+1
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'grpc-1.8.3' into 'master'Sean McGivern2018-01-121-2/+5
| |\ \ \ \ \ \ \ \ \