summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-remove-shared-runners-and-more' into 'master'Grzegorz Bizon2018-01-161-3/+0
|\
| * Remove erroneous text in shared runners page that suggested more runners avai...sh-remove-shared-runners-and-moreStan Hu2018-01-151-3/+0
* | Merge branch 'sh-optimize-ci-build-project' into 'master'Grzegorz Bizon2018-01-163-3/+4
|\ \
| * | Ensure CI pipelines and builds have the correction project associationsStan Hu2018-01-143-3/+4
| |/
* | Merge branch '1819-override-ce' into 'master'Rémy Coutable2018-01-151-0/+1
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into 1819-override-ceLin Jen-Shin2018-01-12507-6689/+9678
| |\ \
| * | | Skip sha_attribute if we're checking staticallyLin Jen-Shin2017-12-261-0/+1
* | | | Merge branch '19493-fork-does-not-protect-default-branch' into 'master'Douwe Maan2018-01-151-4/+1
|\ \ \ \
| * | | | Fork now protects default branch on completion19493-fork-does-not-protect-default-branchTiago Botelho2018-01-151-4/+1
| | |_|/ | |/| |
* | | | Merge branch 'projects-tree-tags-dispatcher-refactor' into 'master'Phil Hughes2018-01-153-12/+31
|\ \ \ \
| * | | | refactored use of for projects:tree:*projects-tree-tags-dispatcher-refactorConstance Okoghenun2018-01-152-5/+3
| * | | | Refactored import of projects:tags:* and projects:tree:* of dispatcher.jsConstance Okoghenun2018-01-153-12/+33
| |/ / /
* | | | Merge branch '41856-backport-stacked-progress-bar' into 'master'Phil Hughes2018-01-153-0/+182
|\ \ \ \
| * | | | Add StackedProgressBar ComponentKushal Pandya2018-01-151-0/+1
| * | | | StackedProgressBar Component stylesKushal Pandya2018-01-151-0/+54
| * | | | StackedProgressBar ComponentKushal Pandya2018-01-151-0/+127
| |/ / /
* | | | Merge branch '41970-job-play-button' into 'master'Kamil Trzciński2018-01-152-6/+6
|\ \ \ \
| * | | | Sets method post for playing actionFilipa Lacerda2018-01-122-6/+6
| | |_|/ | |/| |
* | | | Merge branch 'dispatcher-projects-efi' into 'master'Phil Hughes2018-01-1510-37/+114
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-proj...Simon Knox2018-01-159-25/+84
| |\ \ \ \
| * | | | | dedupeSimon Knox2018-01-153-26/+20
| * | | | | 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-1542-268/+411
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | fix tests from broken importsSimon Knox2018-01-124-7/+9
| * | | | | dynamic imports for projects:e/f/iSimon Knox2018-01-129-29/+120
* | | | | | 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
View Lorry Controller Status