summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-117-13/+24
|
* Merge branch 'winh-restore-blob-fixture' into 'master'Filipa Lacerda2017-08-081-0/+29
|\ | | | | | | | | | | | | Restore blob fixture for JavaScript tests Closes #36187 See merge request !13399
| * Restore blob fixture for JavaScript testswinh-restore-blob-fixturewinh2017-08-081-0/+29
|/
* Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher2017-08-081-4/+4
|
* Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0834-48/+90
|\ | | | | | | | | Add rubocop-gitlab-security gem See merge request !12177
| * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0834-48/+90
| |
* | Merge branch 'fly-out-nav-collapsed' into 'master'Annabel Dunstone Gray2017-08-083-9/+78
|\ \ | | | | | | | | | | | | Fix fly-out navigation not showing for active items in collapsed sidebar See merge request !13353
| * | Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes2017-08-083-9/+78
|/ /
* | Merge branch '36168-fix-transient-preferences-specs' into 'master'Sean McGivern2017-08-081-12/+16
|\ \ | | | | | | | | | | | | Fix Profile > Preferences feature specs See merge request !13382
| * | Fix Profile > Preferences feature specs36168-fix-transient-preferences-specsRémy Coutable2017-08-081-12/+16
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | 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 '36169-fix-master' into 'master'Sean McGivern2017-08-081-13/+8
|\ \ \ | | | | | | | | | | | | | | | | Fix a broken Events API spec See merge request !13381
| * | | Fix a broken Events API spec36169-fix-masterRémy Coutable2017-08-081-13/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-082-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Unset BUNDLE_GEMFILE when installing Gitaly See merge request !13378
| * | | | Unset BUNDLE_GEMFILE when installing GitalyJacob Vosmaer2017-08-082-2/+2
| | | | |
* | | | | Merge branch ↵Rémy Coutable2017-08-085-8/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-085-8/+29
| | | | | |
* | | | | | Merge branch ↵Filipa Lacerda2017-08-087-4/+84
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-087-4/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0820-158/+180
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094
| * | | | | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-079-26/+76
| | | | | | |
| * | | | | | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-077-53/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0715-85/+64
| | | | | | |
* | | | | | | 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 '35098-raise-encoding-confidence-threshold' into 'master'Sean McGivern2017-08-085-1/+102
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise encoding confidence threshold to 50 Closes #35098 See merge request !12990
| * | | | | | | Make sure that we have author and committerLin Jen-Shin2017-08-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case we don't have it setup in ~/.gitconfig
| * | | | | | | Add a test to show that threshold 40 would corrupt35098-raise-encoding-confidence-thresholdLin Jen-Shin2017-08-083-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we set `ENCODING_CONFIDENCE_THRESHOLD` to 40, this test case would not pass. If we raise to 50, this would pass. Note that if in the future rugged didn't return corrupt data, this would be less relevant. But still icu recommend the threshold to be 50, we should just stick with 50.
| * | | | | | | Add changelog entryLin Jen-Shin2017-08-081-0/+4
| | | | | | | |
| * | | | | | | Raise encoding confidence threshold to 50Lin Jen-Shin2017-08-081-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is recommended that we set this to 50: https://gitlab.com/gitlab-org/gitlab-ce/issues/35098#note_35036746 In this particular issue, the confidence was 42 for Shift JIS, but in fact that's encoded in UTF-8 just with a single bad character. In this case, we shouldn't try to treat it as Shift JIS, but just treat it as UTF-8 and remove invalid bytes. Treating it like Shift JIS would corrupt the whole data. Unfortunately, the diff which would cause this could not be disclosed therefore we can't use it as a test example.
* | | | | | | Merge branch 'rc/fix-commits-api' into 'master'Sean McGivern2017-08-0810-173/+592
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name… Closes #15651 See merge request !13370
| * | | | | | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵rc/fix-commits-apiRémy Coutable2017-08-0810-173/+592
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'project-homepage-activity' into 'master'Tim Zallmann2017-08-082-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed activity not loading on project homepage See merge request !13373
| * | | | | | | Fixed activity not loading on project homepageproject-homepage-activityPhil Hughes2017-08-082-0/+16
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '35136-barchart-not-display-label-at-0-hour' into 'master'Clement Ho2017-08-083-21/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bar chart does not display label at hour 0 Closes #35136 See merge request !13330
| * | | | | | | Fix bar chart does not display label at hour 0Jason Dai2017-08-083-21/+23
|/ / / / / / /
* | | | | | | Merge branch 'winh-scope-haml-linter' into 'master'Grzegorz Bizon2017-08-081-9/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict InlineJavaScript for haml_lint to dev and test environment Closes omnibus-gitlab#2658 See merge request !13364
| * | | | | | | Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linterwinh2017-08-081-9/+11
| | | | | | | |
* | | | | | | | Merge branch 'project_events_noteable_iid' into 'master'Rémy Coutable2017-08-085-3/+90
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose noteable_iid in Note See merge request !13265
| * | | | | | | | Expose noteable_iid in Notesue4452017-08-085-3/+90
|/ / / / / / / /
* | | | | | | | Merge branch 'rc/fix-tags-api' into 'master'Sean McGivern2017-08-089-184/+388
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name… See merge request !13368
| * | | | | | | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag ↵Rémy Coutable2017-08-089-184/+388
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into ↵Rémy Coutable2017-08-083-18/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Unset the `RUBYOPT` env variable before installing `gitaly-ruby` Closes #35941 and #35967 See merge request !13313
| * | | | | | | Print the setup steps and duration and fix an issue resulting in re-setuping ↵35941-fix-testing-issue-following-gitaly-install-fixRémy Coutable2017-08-043-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab Shell on each test run Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Unset the RUBYOPT env variable before installing gitaly-rubyRémy Coutable2017-08-043-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status