summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 8.4.9v8.4.9Rémy Coutable2016-04-201-1/+1
|
* Fix failing user lookup feature testRobert Speicher2016-04-191-1/+1
|
* Remove persistent XSS vulnerability in `commit_person_link` helperRobert Speicher2016-04-193-2/+5
| | | | See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1948
* Update VERSION to 8.4.8v8.4.8Robert Speicher2016-04-071-1/+1
|
* Merge branch 'fix/2fa-authentication-spoofing' into 'master'Rémy Coutable2016-04-073-6/+113
| | | | | | Fix 2FA authentication spoofing Signed-off-by: Rémy Coutable <remy@rymai.me>
* Version 8.4.7v8.4.7Rémy Coutable2016-04-051-1/+1
|
* Add 8.4.7 CHANGELOG itemRémy Coutable2016-04-051-0/+3
| | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* Don't fetch any tags from a forked repoStan Hu2016-04-051-1/+1
| | | | Closes #13957
* Version 8.4.6v8.4.6Robert Speicher2016-03-171-1/+1
|
* Merge branch '8-4-git-2-7-4' into '8-4-stable' Robert Speicher2016-03-173-5/+9
|\ | | | | | | | | | | | | Bump Git version requirement to 2.7.4 (for 8.4) [ci skip] See merge request !3283
| * Bump Git version requirement to 2.7.4 (for 8.4)Douwe Maan2016-03-173-5/+9
|/
* Version 8.4.5v8.4.5Robert Speicher2016-02-251-1/+1
|
* Update CHANGELOGRobert Speicher2016-02-251-0/+3
| | | | [ci skip]
* Merge branch 'fix-gitlab_git-version' into '8-4-stable' TR.8.4.4Robert Speicher2016-02-151-1/+1
|\ | | | | | | | | | | | | Fix missing gitlab_git version bump Closes #13430 See merge request !2811
| * Fix missing gitlab_git version bumpStan Hu2016-02-141-1/+1
|/ | | | Closes #13430
* Merge branch 'bump-gitlab-git' into '8-4-stable' Robert Speicher2016-02-101-1/+1
|\ | | | | | | | | | | | | Bump gitlab_git to ~> 7.2.24 bump gitlab_git to ~> 7.2.24 (closes: #13245) See merge request !2772
| * bump gitlab_git to ~> 7.2.24 (closes: #13245)Pirate Praveen2016-02-091-1/+1
| |
* | Version 8.4.4v8.4.4Robert Speicher2016-02-091-1/+1
| |
* | Merge branch 'variables-build-log' into 'master' Robert Speicher2016-02-093-3/+8
| | | | | | | | | | | | | | | | | | Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761
* | Update CHANGELOGRobert Speicher2016-02-091-0/+1
| | | | | | | | [ci skip]
* | Merge branch 'backup-database-timeout-fix' into 'master'Robert Speicher2016-02-092-0/+4
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'ci-permissions-stable' into '8-4-stable' Robert Speicher2016-02-0836-213/+409
|\ \ | |/ |/| | | | | | | | | Limit guest access builds This is https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 for ce-stable See merge request !1943
| * Fix build/permissions.feature tests adding missing stepsKamil Trzcinski2016-02-082-3/+7
| |
| * Limit guest access buildsKamil Trzcinski2016-02-0836-213/+405
|/ | | | | | | | | | | | | | | | | | | 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`.
* Merge branch 'omniauth-saml-update' into 'master'Robert Speicher2016-02-033-5/+8
| | | | | | Updated omniuath-saml to the latest version. See merge request !2684
* Version 8.4.3v8.4.3Robert Speicher2016-02-021-1/+1
|
* Merge branch 'rs-relax-autosize' into 'master'Robert Speicher2016-02-026-3/+281
| | | | | | | | | | | | | | | | | | | 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
* Merge branch 'expand-git-instrumentation' into 'master'Yorick Peterse2016-02-021-2/+20
| | | | | | | | Expand Git instrumentation This instruments some extra `Gitlab::Git` code as well as a collection of `Rugged` constants. See merge request !2664
* Merge branch 'increase_lfs_size_column' into 'master'Drew Blessing2016-01-313-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'rs-ldap-user' into 'master' Robert Speicher2016-01-311-7/+8
| | | | | | | Backport LDAP user assignment changes from EE See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146 See merge request !2641
* Merge branch 'update_sentry_gem' into 'master'Robert Speicher2016-01-312-1/+3
| | | | | | | | | | 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
* Merge branch 'mr-merge-base' into 'master'Robert Speicher2016-01-317-23/+27
| | | | | | | | Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632
* Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-316-43/+84
| | | | | Fix highlighting in blame view. See merge request !2630
* Version 8.4.2v8.4.2Robert Speicher2016-01-271-1/+1
|
* Update gitlab-workhorse versions in documentationRobert Speicher2016-01-272-2/+2
| | | | [ci skip]
* Update CHANGELOGRobert Speicher2016-01-271-4/+2
| | | | [ci skip]
* Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher2016-01-277-6/+42
| | | | | | | | | 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
* Merge branch 'fix/commit-status-artifacts' into 'master' Kamil Trzciński2016-01-274-56/+84
| | | | | | | Use generic method to checks if artifacts are available Closes #12626 See merge request !2576
* Merge branch 'diff-colors' into 'master' Robert Speicher2016-01-275-8/+9
| | | | | | | | | 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
* Update CHANGELOGRobert Speicher2016-01-261-12/+7
| | | | [ci skip]
* Merge branch 'bug/jschatz1/file-browser-lines' into 'master' Dmitriy Zaporozhets2016-01-263-3/+2
| | | | | | | | | | 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
* Merge branch 'instrument-gitlab-git-repository' into 'master' Douwe Maan2016-01-261-0/+1
| | | | | | | Instrument Gitlab::Git::Repository See merge request !2528
* Merge branch 'update-gitlab-git' into 'master'Douwe Maan2016-01-263-2/+22
| | | | | | | | | | 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
* Merge branch 'fix/bump-workhorse-version' into 'master' Robert Speicher2016-01-262-1/+15
| | | | | | | Bump Workhorse version to 0.6.2 Fix for #12634 has been introduced in gitlab-org/gitlab-workhorse!34. See merge request !2616
* Version 8.4.1v8.4.1Robert Speicher2016-01-251-1/+1
|
* Update CHANGELOGRobert Speicher2016-01-251-0/+6
| | | | [ci skip]
* Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-252-5/+124
| | | | | | | Fix import redirect loop Fixes #11864 See merge request !2606
* Merge branch 'instrumentation-signature' into 'master' Douglas Barbosa Alexandre2016-01-252-3/+29
| | | | | | | 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
* Merge branch 'note-highlighting' into 'master' Robert Speicher2016-01-2516-64/+34
| | | | | | | | | | | 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
* Merge branch 'rs-rails-security' into 'master' Robert Speicher2016-01-253-35/+42
| | | | | | | Update rails, rails-html-sanitizer, and nokogiri for security fixes See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643 See merge request !2603