Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-07Update VERSION to 8.4.8v8.4.8Robert Speicher
2016-04-07Merge branch 'fix/2fa-authentication-spoofing' into 'master'Rémy Coutable
Fix 2FA authentication spoofing Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-05Version 8.4.7v8.4.7Rémy Coutable
2016-04-05Add 8.4.7 CHANGELOG itemRémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-05Don't fetch any tags from a forked repoStan Hu
Closes #13957
2016-03-18Version 8.4.6v8.4.6Robert Speicher
2016-03-18Merge branch '8-4-git-2-7-4' into '8-4-stable' Robert Speicher
Bump Git version requirement to 2.7.4 (for 8.4) [ci skip] See merge request !3283
2016-03-18Bump Git version requirement to 2.7.4 (for 8.4)Douwe Maan
2016-02-25Version 8.4.5v8.4.5Robert Speicher
2016-02-25Update CHANGELOGRobert Speicher
[ci skip]
2016-02-15Merge branch 'fix-gitlab_git-version' into '8-4-stable' Robert Speicher
Fix missing gitlab_git version bump Closes #13430 See merge request !2811
2016-02-14Fix missing gitlab_git version bumpStan Hu
Closes #13430
2016-02-11Merge branch 'bump-gitlab-git' into '8-4-stable' Robert Speicher
Bump gitlab_git to ~> 7.2.24 bump gitlab_git to ~> 7.2.24 (closes: #13245) See merge request !2772
2016-02-10Version 8.4.4v8.4.4Robert Speicher
2016-02-10Merge branch 'variables-build-log' into 'master' Robert Speicher
Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761
2016-02-09Update CHANGELOGRobert Speicher
[ci skip]
2016-02-09Merge branch 'backup-database-timeout-fix' into 'master'Robert Speicher
Fix timeout issue for rake task gitlab:backup:create This is a fix for a database timeout which can occur when the backup create task is taking very long (1-2 hours). It seems that ActiveRecord is loosing the connection after a hour idleness and need to be reconnected before use. See merge request !2757
2016-02-09bump gitlab_git to ~> 7.2.24 (closes: #13245)Pirate Praveen
2016-02-09Merge branch 'ci-permissions-stable' into '8-4-stable' Robert Speicher
Limit guest access builds This is https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 for ce-stable See merge request !1943
2016-02-08Fix build/permissions.feature tests adding missing stepsKamil Trzcinski
2016-02-08Limit guest access buildsKamil Trzcinski
This solves https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 1. This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the status of a build, but doesn't allow to see a build details) - create_commit_status: allows to create a new commit status using API 2. I do make sure that the proper permissions are used in all places where the CI can be shown. 3. Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled. 4. Add CI setting: public_builds. 5. The artifacts specific permission are removed, since they are covered by `*_build`.
2016-02-03Merge branch 'omniauth-saml-update' into 'master'Robert Speicher
Updated omniuath-saml to the latest version. See merge request !2684
2016-02-02Version 8.4.3v8.4.3Robert Speicher
2016-02-02Merge branch 'rs-relax-autosize' into 'master'Robert Speicher
Allow manual resize of js-autosize textareas First, the autosize library was being too controlling and removed the `resize` property from any elements to which it was attached, removing the drag handle. We've disabled this behavior in the vendored library and added a spec to prevent a regression during an upgrade. Second, we detect (as best we can) when the user manually resizes an autosize textarea, and then remove the autosize behavior from it and increase its max-height. This should allow for the best of both worlds. Closes #12832 See merge request !2653
2016-02-02Merge branch 'expand-git-instrumentation' into 'master'Yorick Peterse
Expand Git instrumentation This instruments some extra `Gitlab::Git` code as well as a collection of `Rugged` constants. See merge request !2664
2016-02-01Merge branch 'increase_lfs_size_column' into 'master'Drew Blessing
Increase LFS objects size column Fixes #12745 Increases the `size` column integer limit to an 8-byte integer. This allows for a max value of `9223372036854775807` which is 9,223,372,036 GB. That should do it :smiley: I tested this by first reproducing the error (push a file larger than 2.1 GB). The error was: ``` RangeError (3145728000 is out of range for ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer with limit 4): lib/gitlab/lfs/response.rb:232:in `store_file' lib/gitlab/lfs/response.rb:170:in `render_lfs_upload_ok' lib/gitlab/lfs/response.rb:51:in `block in render_storage_upload_store_response' lib/gitlab/lfs/response.rb:204:in `render_response_to_push' lib/gitlab/lfs/response.rb:50:in `render_storage_upload_store_response' lib/gitlab/lfs/router.rb:76:in `put_response' lib/gitlab/lfs/router.rb:20:in `try_call' lib/gitlab/backend/grack_auth.rb:41:in `call' lib/gitlab/backend/grack_auth.rb:18:in `call_with_kerberos_support' lib/gitlab/backend/grack_auth.rb:8:in `call' ``` Then I ran this migration and pushed the file again. It uploaded successfully. See merge request !2644
2016-02-01Merge branch 'rs-ldap-user' into 'master' Robert Speicher
Backport LDAP user assignment changes from EE See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146 See merge request !2641
2016-02-01Merge branch 'update_sentry_gem' into 'master'Robert Speicher
Update sentry-raven gem. Should resolve `fatal: Not a git repository (or any of the parent directories): .git` warnings. Fixes #12657 See merge request !2636
2016-02-01Merge branch 'mr-merge-base' into 'master'Robert Speicher
Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632
2016-02-01Merge branch 'highlight-blame' into 'master' Robert Speicher
Fix highlighting in blame view. See merge request !2630
2016-01-28Version 8.4.2v8.4.2Robert Speicher
2016-01-28Update gitlab-workhorse versions in documentationRobert Speicher
[ci skip]
2016-01-28Update CHANGELOGRobert Speicher
[ci skip]
2016-01-28Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher
Fix CI runner version not being properly updated when asked for a build Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again. See merge request !2618
2016-01-28Merge branch 'fix/commit-status-artifacts' into 'master' Kamil Trzciński
Use generic method to checks if artifacts are available Closes #12626 See merge request !2576
2016-01-28Merge branch 'diff-colors' into 'master' Robert Speicher
Increase contrast between highlighted code comments and inline diff marker. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12737. It was especially bad in Monokai, better now. See merge request !2629
2016-01-27Update CHANGELOGRobert Speicher
[ci skip]
2016-01-27Merge branch 'bug/jschatz1/file-browser-lines' into 'master' Dmitriy Zaporozhets
Bug/jschatz1/file browser lines Fixes #12725 ![Screen_Shot_2016-01-26_at_11.19.39_AM](/uploads/c5f5a143926600e02de4cfc0687ed8dd/Screen_Shot_2016-01-26_at_11.19.39_AM.png) See merge request !2615
2016-01-26Merge branch 'instrument-gitlab-git-repository' into 'master' Douwe Maan
Instrument Gitlab::Git::Repository See merge request !2528
2016-01-26Merge branch 'update-gitlab-git' into 'master'Douwe Maan
Update gitlab_git & use new method for counting branches Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62 Fixes #12418 See merge request !2535
2016-01-26Merge branch 'fix/bump-workhorse-version' into 'master' Robert Speicher
Bump Workhorse version to 0.6.2 Fix for #12634 has been introduced in gitlab-org/gitlab-workhorse!34. See merge request !2616
2016-01-26Version 8.4.1v8.4.1Robert Speicher
2016-01-26Update CHANGELOGRobert Speicher
[ci skip]
2016-01-26Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher
Fix import redirect loop Fixes #11864 See merge request !2606
2016-01-26Merge branch 'instrumentation-signature' into 'master' Douglas Barbosa Alexandre
Correct arity for instrumented methods w/o args This should fix the problem of imports not working. See https://gitlab.com/gitlab-org/gitlab-ce/issues/12450#note_3380730 for the details/context of these changes. See merge request !2602
2016-01-26Merge branch 'note-highlighting' into 'master' Robert Speicher
Highlight note code and edit preview More highlighting fixes! Highlighting wasn't applied all the way for code in notes, diff notes diffs and diff preview (on the file edit page). The CSS changes further unify the styling for file-content highlighting, diff highlighting and note code highlighting. See merge request !2594
2016-01-26Merge branch 'rs-rails-security' into 'master' Robert Speicher
Update rails, rails-html-sanitizer, and nokogiri for security fixes See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643 See merge request !2603
2016-01-26Merge branch 'rails_update' into 'master' Valery Sizov
Rails updated to 4.2.5 I hope it'll fix weird spec failing (according to https://github.com/rails/rails/pull/22383) @dzaporozhets @yorickpeterse See merge request !2591
2016-01-22Merge branch 'solarized-dark-old-lines' into 'master' Robert Speicher
Make deleted line background color for Solarized Dark a little darker The difference is very slight, and I don't even _use_ Solarized Dark, but this annoyed me. See merge request !2563
2016-01-22Merge branch 'diff-highlight-themes' into 'master' Robert Speicher
Diff highlight themes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484 See merge request !2530