summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Hide overflow-x on collapsed sidebar36270-collapsed-sidebar-scrollAnnabel Dunstone Gray2017-08-101-0/+1
* Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'Robert Speicher2017-08-096-16/+16
|\
| * Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-096-16/+16
* | Merge branch '35996-icon-hover-color' into 'master'Phil Hughes2017-08-091-0/+4
|\ \
| * | Update icon color on hover35996-icon-hover-colorAnnabel Dunstone Gray2017-08-081-0/+4
* | | Merge branch 'mr-changes-container-full-width' into 'master'Annabel Dunstone Gray2017-08-092-15/+16
|\ \ \
| * | | Fixed merge request changes sticky container not spreading full widthmr-changes-container-full-widthPhil Hughes2017-08-082-15/+16
* | | | Merge branch '36179-align-nav-items' into 'master'Phil Hughes2017-08-091-1/+2
|\ \ \ \
| * | | | Align all nav items in sidebar36179-align-nav-itemsAnnabel Dunstone Gray2017-08-081-1/+2
| | |/ / | |/| |
* | | | Merge branch 'fix-collapsed-sidebar-item-height' into 'master'Phil Hughes2017-08-091-2/+5
|\ \ \ \
| * | | | Fix height of collapsed sidebar itemsfix-collapsed-sidebar-item-heightAnnabel Dunstone Gray2017-08-081-2/+5
| |/ / /
* | | | Merge branch 'pikaday-undefined-fix' into 'master'Tim Zallmann2017-08-094-5/+5
|\ \ \ \
| * | | | Fix pikaday being undefinedPhil Hughes2017-08-094-5/+5
| | |_|/ | |/| |
* | | | Merge branch '36119-issuable-workers' into 'master'Sean McGivern2017-08-095-13/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Simplify checking if objects exist code in new issaubles workers36119-issuable-workersJarka Kadlecova2017-08-085-13/+18
* | | | Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-091-1/+1
| |/ / |/| |
* | | 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
| |\ \ \ \ \