summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-096-16/+16
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* 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
|\ | | | | | | | | Add rubocop-gitlab-security gem See merge request !12177
| * 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
|\ \ | | | | | | | | | | | | Remove repo editor feature flag from RC1 See merge request !13379
| * | Revert "Add user_dropdown_link to prompt users to turn on new repo"remove-repo-editor-feature-flagMike Greiling2017-08-083-3/+0
| | | | | | | | | | | | This reverts commit 79f94c8d221f9391f48899808b7a36e3905dab83.
| * | hide the feature flag for the repo editor featureMike Greiling2017-08-081-22/+0
| | |
| * | Revert "Combine 'turn on/off' user dropdown links into 'experimental ↵Mike Greiling2017-08-085-5/+7
| | | | | | | | | | | | | | | | | | features' link and andded 'experimental features' heading for user preferences page" This reverts commit 75f490a4c95c41f9364e8e0cba443b312f01a686.
* | | Merge branch ↵Rémy Coutable2017-08-082-8/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one' into 'master' Resolve "API v4 allows setting a branch that doesn't exist as the default one" Closes #36010 See merge request !13359
| * | | 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 ↵Filipa Lacerda2017-08-085-4/+38
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui' into 'master' Resolve "'Please select a file' when attempting to upload or replace from the UI" Closes #35052 See merge request !12863
| * | | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-085-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | hide placeholder text when files have been added vertically center dropzone area content close modal after file upload succeeds
* | | | Merge branch 'fly-out-min-width' into 'master'Annabel Dunstone Gray2017-08-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix fly-out width when it has long items See merge request !13371
| * | | | 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 RPC Closes gitaly#402 See merge request !13094
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps keep the abstraction layers simpler, and also keep the interface of those methods consistent, in case of implementation changes.
| * | | | 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 navbar See merge request !13355
| * | | | | 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 homepage See merge request !13373
| * | | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
| * | | | Show all labelsRegis Boudinot2017-08-083-5/+14
| | | | |
| * | | | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-0810-32/+57
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
| | * | | 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 Gitaly Closes gitaly#443 See merge request !13268
| | * | | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-11/+28
| | |/ / / | | | | | | | | | | | | | | | Closes gitaly#443
| * | | | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-077-4/+70
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Issuables: Move some code from create services to Sidekiq workers See merge request !13326
| | * | | | 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/CD See merge request !13039
| | * | | | | Add two more metrics for CI/CDzj-add-ci-metricsZ.J. van de Weg2017-07-312-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As its hard right now to determine what is a good metric and whats not, these two are not listed in the docs, nor will they get a CHANGELOG entry.
| * | | | | | Merge branch 'collapse-sidebar-bugs' into 'master'Phil Hughes2017-08-078-7/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove JS flicker on page load; UI tweaks See merge request !13347
| | * | | | | | 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 app Closes #35761 See merge request !13217
| | * | | | | | 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/2551 to CE Closes #21391 See merge request !13275
| | * | | | | | Backport changes in ↵Nick Thomas2017-08-072-4/+3
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
| * | | | | | Improve mobile sidebarAnnabel Dunstone Gray2017-08-076-42/+27
| | | | | | |
| * | | | | | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-0712-121/+135
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262
| | * | | | | | remove sidebar height management from wikis sidebarMike Greiling2017-08-071-1/+0
| | | | | | | |
View Lorry Controller Status