summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '41546-count-query-for-issues-and-mrs-runs-twice-on-group-index'...Grzegorz Bizon2018-01-151-6/+6
|\
| * Fix double execution of COUNT query on group pages41546-count-query-for-issues-and-mrs-runs-twice-on-group-indexSean McGivern2018-01-091-6/+6
* | Merge branch 'snippets-dispatcher-refactor' into 'master'Phil Hughes2018-01-154-3/+31
|\ \
| * | Use common form.jssnippets-dispatcher-refactorClement Ho2018-01-125-21/+6
| * | Fix eslintClement Ho2018-01-114-4/+4
| * | Merge branch 'master' into snippets-dispatcher-refactorClement Ho2018-01-1156-70/+152
| |\ \
| * | | Code improvementsClement Ho2018-01-115-5/+7
| * | | Refactor dispatcher for snippets:*Jacob Schatz2018-01-115-3/+44
* | | | Merge branch 'dispatcher-project-mr' into 'master'Phil Hughes2018-01-152-0/+21
|\ \ \ \
| * | | | Refactor dispatcher project mr index pathdispatcher-project-mrClement Ho2018-01-112-0/+21
| | |/ / | |/| |
* | | | Merge branch 'sh-log-when-user-blocked' into 'master'Douwe Maan2018-01-152-4/+9
|\ \ \ \
| * | | | Log and send a system hook if a blocked user fails to loginsh-log-when-user-blockedStan Hu2018-01-142-4/+9
* | | | | Merge branch 'dispatcher-branches-create' into 'master'Phil Hughes2018-01-152-2/+10
|\ \ \ \ \
| * | | | | Remove unused create index.jsdispatcher-branches-createClement Ho2018-01-121-3/+0
| * | | | | Fix eslint so that pipeline doesnt fail after megeClement Ho2018-01-111-1/+0
| * | | | | Merge branch 'master' into dispatcher-branches-createClement Ho2018-01-11131-396/+629
| |\ \ \ \ \
| * | | | | | Refactor dispatcher project branches create pathClement Ho2018-01-113-1/+13
* | | | | | | Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'Grzegorz Bizon2018-01-151-7/+14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-111-7/+14
* | | | | | | Merge branch '16988-use-toggle-for-subscribed-unsubscribed-to-notifications' ...Annabel Dunstone Gray2018-01-123-29/+46
|\ \ \ \ \ \ \
| * | | | | | | 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 karma testsMike Greiling2018-01-121-1/+1
| * | | | | | | 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 'fix_gitlab-ce#41891' into 'master'Annabel Dunstone Gray2018-01-122-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | remove wrong/unneeded margin of custom navigation header logo without logo textMarkus Doits2018-01-122-3/+8
* | | | | | | | | Display related merge requests in commit detail pageHiroyuki Sato2018-01-127-2/+104
* | | | | | | | | 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-1155-66/+145
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Code improvementsClement Ho2018-01-114-11/+8
| * | | | | | | | | Refactor projects:l*Jacob Schatz2018-01-114-2/+41
* | | | | | | | | | Move row containing Projects, Users and Groups count to the topKushal Pandya2018-01-121-28/+28
* | | | | | | | | | 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 remote-tracking branch 'upstream/master' into 41731-predicate-memoizationLin Jen-Shin2018-01-1314-53/+89
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ 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-122-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Only search for MR revert commits on notes after MR was merged41807-15665-consistently-502s-because-it-fetches-every-commitSean McGivern2018-01-122-3/+13
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | 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-122-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Use simple Next/Prev paging for jobs to avoid large count queries on arbitrar...disable-pages-on-jobsGreg Stark2018-01-112-2/+2
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch '41937-vue-prop-type' into 'master'Phil Hughes2018-01-121-1/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix boolean prop being provided as string41937-vue-prop-typeFilipa Lacerda2018-01-111-1/+5
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch '41797-prometheus-wording-fixes' into 'master'Kamil Trzciński2018-01-121-2/+1
| |\ \ \ \ \ \ \ \ \ \ \