home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,926 Commits 48 Branches 340 Tags
v8.4.3
Commit Graph
22926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher eb6f691760 Version 8.4.3 v8.4.3 2016-02-02 13:00:07 -05:00
Robert SpeicherandRobert Speicher 3033ec91aa Merge branch 'rs-relax-autosize' into 'master' 
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-02 10:49:33 -05:00
Yorick Peterse 503ad19336 Merge branch 'expand-git-instrumentation' into 'master' 
Expand Git instrumentation

This instruments some extra `Gitlab::Git` code as well as a collection of `Rugged` constants.

See merge request !2664
 2016-02-02 11:19:51 +01:00
Drew BlessingandRobert Speicher 106722fa39 Merge branch 'increase_lfs_size_column' into 'master' 
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 😃

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-01-31 19:26:59 -05:00
Robert SpeicherandRobert Speicher f2faa0078f Merge branch 'rs-ldap-user' into 'master' 
Backport LDAP user assignment changes from EE

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

See merge request !2641
 2016-01-31 19:26:59 -05:00
Robert SpeicherandRobert Speicher fa69b067a7 Merge branch 'update_sentry_gem' into 'master' 
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-01-31 19:26:59 -05:00
Robert SpeicherandRobert Speicher ff1e0ecfc6 Merge branch 'mr-merge-base' into 'master' 
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-01-31 19:26:59 -05:00
Robert SpeicherandRobert Speicher 3d687ec316 Merge branch 'highlight-blame' into 'master' 
Fix highlighting in blame view.

See merge request !2630
 2016-01-31 19:26:59 -05:00
Robert Speicher 8d07b81bc1 Version 8.4.2 v8.4.2 2016-01-27 18:40:08 -05:00
Robert Speicher 456f5faef3 Update gitlab-workhorse versions in documentation 
[ci skip]
 2016-01-27 18:30:44 -05:00
Robert Speicher 3dca43c69f Update CHANGELOG 
[ci skip]
 2016-01-27 17:48:22 -05:00
Robert SpeicherandRobert Speicher 026885eeb1 Merge branch 'fix-ci-runners-version-update' into 'master' 
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-27 17:47:23 -05:00
Kamil TrzcińskiandRobert Speicher 0184667424 Merge branch 'fix/commit-status-artifacts' into 'master' 
Use generic method to checks if artifacts are available

Closes #12626

See merge request !2576
 2016-01-27 17:47:06 -05:00
Robert SpeicherandRobert Speicher 78860b6074 Merge branch 'diff-colors' into 'master' 
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-27 17:46:20 -05:00
Robert Speicher 8999a652f2 Update CHANGELOG 
[ci skip]
 2016-01-26 16:18:35 -08:00
Dmitriy ZaporozhetsandRobert Speicher 75b64fce29 Merge branch 'bug/jschatz1/file-browser-lines' into 'master' 
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-26 15:59:33 -08:00
Douwe MaanandRobert Speicher 794cd87bbb Merge branch 'instrument-gitlab-git-repository' into 'master' 
Instrument Gitlab::Git::Repository



See merge request !2528
 2016-01-26 11:50:20 -08:00
Douwe MaanandRobert Speicher 40b670f12a Merge branch 'update-gitlab-git' into 'master' 
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-26 11:48:14 -08:00
Robert SpeicherandRobert Speicher c522d2ff65 Merge branch 'fix/bump-workhorse-version' into 'master' 
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-26 11:42:51 -08:00
Robert Speicher 052b38dca1 Version 8.4.1 v8.4.1 2016-01-25 21:16:29 -08:00
Robert Speicher c08d24c391 Update CHANGELOG 
[ci skip]
 2016-01-25 17:09:13 -08:00
Robert SpeicherandRobert Speicher 80814cbd04 Merge branch 'fix-import-redirect-loop' into 'master' 
Fix import redirect loop

Fixes #11864 

See merge request !2606
 2016-01-25 17:05:49 -08:00
Douglas Barbosa AlexandreandRobert Speicher 6881ba0e79 Merge branch 'instrumentation-signature' into 'master' 
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-25 16:10:20 -08:00
Robert SpeicherandRobert Speicher 65d85a4403 Merge branch 'note-highlighting' into 'master' 
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-25 16:01:37 -08:00
Robert SpeicherandRobert Speicher cb664e269f Merge branch 'rs-rails-security' into 'master' 
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-25 15:26:24 -08:00
Valery SizovandRobert Speicher deee73f904 Merge branch 'rails_update' into 'master' 
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-25 13:36:00 -08:00
Robert SpeicherandRobert Speicher 0845771683 Merge branch 'solarized-dark-old-lines' into 'master' 
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-22 11:48:17 -08:00
Robert SpeicherandRobert Speicher 22a0106fa3 Merge branch 'diff-highlight-themes' into 'master' 
Diff highlight themes

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484

See merge request !2530
 2016-01-22 11:47:51 -08:00
Kamil TrzcińskiandRobert Speicher 2a759e16fd Merge branch 'mysql-password-ci' into 'master' 
Allow empty Mysql password on CI

[ci skip]

See merge request !2558
 2016-01-22 11:41:52 -08:00
Dmitriy ZaporozhetsandRobert Speicher 4c08a7b097 Merge branch 'fix-error-500-mr-search' into 'master' 
Fix Error 500 when doing a search for merge requests

Potential fix for #11547

See merge request !2525
 2016-01-22 11:38:47 -08:00
Julian RademacherandMarin Jankovski e9d64e1e36 GitLab 8.4 uses gitlab-shell v2.6.10 2016-01-22 13:13:46 +01:00
Marin Jankovski f8ed531544 Merge branch 'changelog_fix' into '8-4-stable' 
Remove unreleased note from changelog (8-4-stable)



See merge request !2556
 2016-01-22 11:41:57 +00:00
Achilleas Pipinellis ebc8746489 Remove unreleased note from changelog 
[ci skip]
 2016-01-22 12:12:10 +01:00
Marin Jankovski 1b1c0ba2bf Version 8.4.0 v8.4.0 2016-01-22 10:44:01 +01:00
Achilleas PipinellisandRobert Speicher e2f7b11dff Merge branch 'file_finder_doc_fixes' into 'master' 
Fix grammar and typos in file finder docs



See merge request !2547
 2016-01-21 23:43:17 -08:00
Robert SpeicherandRobert Speicher 718819a4db Merge branch 'fix-mr-diff-edit-button' into 'master' 
Fix MR diff 'Edit' button

It now works and has the right size.

See merge request !2542
 2016-01-21 23:40:14 -08:00
Robert SpeicherandRobert Speicher d6dd80d097 Merge branch 'fix-diff-comments' into 'master' 
More highlighted diff fixes

See merge request !2545
 2016-01-21 23:39:54 -08:00
Robert SpeicherandRobert Speicher 13a7808242 Merge branch 'unescaped-diffs' into 'master' 
Make sure non-highlighted diffs are still escaped

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521

See merge request !2544
 2016-01-21 17:37:49 -08:00
Achilleas PipinellisandRobert Speicher 9e1f5152f1 Merge branch 'fix_file_finder' into 'master' 
File finder can be invoked from anywhere!



See merge request !2543
 2016-01-21 15:49:34 -08:00
Robert SpeicherandRobert Speicher 83b7ac6499 Merge branch 'ci/recursive-artifacts-entries' into 'master' 
Add method to calculate total size of artifacts in subpath

See merge request !2500
 2016-01-21 15:23:26 -08:00
Achilleas PipinellisandRobert Speicher fc293bae4a Merge branch 'file_finder' into 'master' 
Add file finder documentation

Closes #7966 

See merge request !2541
 2016-01-21 15:21:23 -08:00
Grzegorz BizonandRobert Speicher 1206631ab8 Merge branch 'fix/artifacts-download-progress-bar' into 'master' 
Do not use progress bar when downloading build artifacts

Closes #12491

See merge request !2531
 2016-01-21 15:11:30 -08:00
Douwe MaanandRobert Speicher e7a875cc79 Merge branch 'ci/cache-key' into 'master' 
Added cache:key to .gitlab-ci.yml allowing to fine tune the caching

The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need:

1. Cache per-build for all branches:

```
cache:
    key: "$CI_BUILD_NAME"
    untracked: true
```

2. Cache per-branch for all jobs:

```
cache:
    key: "$CI_BUILD_REF"
    untracked: true
```



/cc @DouweM @grzesiek @axil


See merge request !2436
 2016-01-21 15:01:36 -08:00
Achilleas PipinellisandRobert Speicher ed54f5f4df Merge branch 'housekeeping-doc' into 'master' 
Add housekeeping feature documentation

Add documentation about the new housekeeping feature in the project settings page.

See merge request !2371
 2016-01-21 14:53:30 -08:00
Achilleas PipinellisandRobert Speicher a1e4867160 Merge branch 'ci/build-artifacts-documentation' into 'master' 
Add basic documentation for build artifacts

/cc @axil @ayufan 

See merge request !2511
 2016-01-21 14:07:50 -05:00
Achilleas PipinellisandRobert Speicher 70add6912e Merge branch 'doc_restart_gitlab' into 'master' 
Add documentation on restarting GitLab

This will save as time from writing the same commands
over and over again.

See merge request !2510
 2016-01-21 14:07:27 -05:00
Robert SpeicherandRobert Speicher 86420a5a6b Merge branch 'fix-permissions' into 'master' 
Remove execution permissions from font assets

[ci skip]

See merge request !2082
 2016-01-21 11:14:53 -05:00
Robert SpeicherandRobert Speicher fd106c7fdd Merge branch 'workhorse-path' into 'master' 
Init script changes for gitlab-workhorse in 8.4

Goes with https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/31

Also bumps gitlab-workhorse to 0.6.1.

[ci skip]

See merge request !2529
 2016-01-21 11:09:09 -05:00
Douwe MaanandRobert Speicher ef3bccac7e Merge branch 'fix-github-wiki-import' into 'master' 
Fix import of GitHub's wiki when the repository has not been created

Fixes #12503 

See merge request !2533
 2016-01-21 11:04:54 -05:00
Marin Jankovski 56adae8682 Version 8.4.0-rc3 v8.4.0-rc3 2016-01-21 14:02:29 +01:00