summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Align all nav items in sidebar36179-align-nav-itemsAnnabel Dunstone Gray2017-08-081-1/+2
* Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0818-30/+31
|\
| * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0818-30/+31
* | Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes2017-08-082-6/+25
* | Merge branch 'remove-repo-editor-feature-flag' into 'master'Jacob Schatz2017-08-084-27/+4
|\ \
| * | Revert "Add user_dropdown_link to prompt users to turn on new repo"remove-repo-editor-feature-flagMike Greiling2017-08-083-3/+0
| * | hide the feature flag for the repo editor featureMike Greiling2017-08-081-22/+0
| * | Revert "Combine 'turn on/off' user dropdown links into 'experimental features...Mike Greiling2017-08-085-5/+7
* | | Merge branch '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-...Rémy Coutable2017-08-082-8/+13
|\ \ \
| * | | Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-082-8/+13
* | | | Merge branch '35052-please-select-a-file-when-attempting-to-upload-or-replace...Filipa Lacerda2017-08-085-4/+38
|\ \ \ \ | |_|_|/ |/| | |
| * | | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-085-4/+38
* | | | Merge branch 'fly-out-min-width' into 'master'Annabel Dunstone Gray2017-08-081-1/+1
|\ \ \ \
| * | | | Fix fly-out width when it has long itemsfly-out-min-widthPhil Hughes2017-08-081-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-083-17/+8
|\ \ \ \
| * | | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-071-1/+1
| * | | | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-071-12/+2
| * | | | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-073-4/+5
* | | | | Merge branch 'header-z-index-fix' into 'master'Annabel Dunstone Gray2017-08-082-1/+3
|\ \ \ \ \
| * | | | | Fixed modals being below navbarheader-z-index-fixPhil Hughes2017-08-072-1/+3
| |/ / / /
* | | | | Merge branch 'project-homepage-activity' into 'master'Tim Zallmann2017-08-081-0/+1
|\ \ \ \ \
| * | | | | Fixed activity not loading on project homepageproject-homepage-activityPhil Hughes2017-08-081-0/+1
| | |/ / / | |/| | |
* | | | | Fix bar chart does not display label at hour 0Jason Dai2017-08-082-21/+19
|/ / / /
* | | | Merge branch 'master' into ideMike Greiling2017-08-0787-422/+1200
|\ \ \ \
| * | | | Show all labelsRegis Boudinot2017-08-083-5/+14
| * | | | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-0810-32/+57
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Move locked_at removal to post-deployment migrationOswaldo Ferreira2017-08-071-0/+1
| | * | | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-0710-32/+56
| * | | | 33874 confidential issue redesignRegis Boudinot2017-08-079-28/+260
| * | | | Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-073-2/+6
| * | | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-11/+28
| |\ \ \ \
| | * | | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-11/+28
| | |/ / /
| * | | | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-077-4/+70
| |\ \ \ \
| | * | | | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-077-4/+70
| * | | | | Merge branch 'zj-add-ci-metrics' into 'master'Sean McGivern2017-08-072-0/+42
| |\ \ \ \ \
| | * | | | | Add two more metrics for CI/CDzj-add-ci-metricsZ.J. van de Weg2017-07-312-0/+42
| * | | | | | Merge branch 'collapse-sidebar-bugs' into 'master'Phil Hughes2017-08-078-7/+15
| |\ \ \ \ \ \
| | * | | | | | Add class to other sidebarsAnnabel Dunstone Gray2017-08-073-3/+3
| | * | | | | | Check if sidebar existscollapse-sidebar-bugsAnnabel Dunstone Gray2017-08-071-1/+1
| | * | | | | | Remove JS flicker on page load; UI tweaksAnnabel Dunstone Gray2017-08-075-4/+12
| | | |_|/ / / | | |/| | | |
| * | | | | | Group-level new issue & MR using previously selected projectBryce Johnson2017-08-074-13/+122
| * | | | | | Merge branch '35761-convdev-perc' into 'master'Sean McGivern2017-08-072-12/+12
| |\ \ \ \ \ \
| | * | | | | | Store & use ConvDev percentages returned by Version app35761-convdev-percJarka Kadlecova2017-08-072-12/+12
| * | | | | | | [EE Backport] Update log audit event in omniauth_callbacks_controller.rbJames Lopez2017-08-071-6/+15
| * | | | | | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-072-4/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-072-4/+3
| | | |/ / / / | | |/| | | |
| * | | | | | Improve mobile sidebarAnnabel Dunstone Gray2017-08-076-42/+27
| * | | | | | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-0712-121/+135
| |\ \ \ \ \ \
| | * | | | | | remove sidebar height management from wikis sidebarMike Greiling2017-08-071-1/+0
| | * | | | | | fix sidebar job list in IE 11Mike Greiling2017-08-041-0/+2
View Lorry Controller Status