22907 Commits
Author SHA1 Message Date
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
Robert SpeicherandRobert Speicher 0762d07e02 Merge branch 'fix-project-creation' into 'master'
Creator should be added as a master of the project on creation

Fixes #4222 

This also enable a project creator to add themselves as a master of the
project for existing repositories that were created in the meanwhile
that they don't appear as members.

See merge request !2520
2016-01-20 18:24:26 -05:00
Robert Speicher 8366dbdacf Remove Performance Monitoring from Integration docs
[ci skip]
2016-01-20 17:56:29 -05:00
Robert SpeicherandRobert Speicher 960d873989 Merge branch 'fix-github-pull-requests-import' into 'master'
Fix cross projects detection when importing GitHub pull requests

Fixes #12456

See merge request !2523
2016-01-20 17:13:55 -05:00
Achilleas PipinellisandRobert Speicher ed540c3741 Merge branch 'metrics-documentation' into 'master'
Added documentation for GitLab Metrics

This adds documentation for the metrics code I recently added.

Two notes:

* I'm referring to this feature as "GitLab Metrics" everywhere simply
  because the code resides in the `Gitlab::Metrics` namespace. A
  different name is fine, though I think just "Metrics" might be a bit
  too abstract.
* Grafana isn't covered since it's fairly straight-forward to setup
  (there's nothing really special we can cover). I think we _should_
  cover it once we start shipping it with Omnibus.

I assigned @axil since he's our technical writer/documentation guru,
feel free to re-assign if needed.

cc @sytses @axil @dzaporozhets @JobV 

See merge request !2484
2016-01-20 17:13:07 -05:00
Robert SpeicherandRobert Speicher eebb691cb6 Merge branch 'issue_3945' into 'master'
Add syntax highlighting to diff view

Closes #3945

See merge request !2109
2016-01-20 16:56:13 -05:00
Robert Speicher 6a5cd3ca41 Merge branch 'feature/check-against-rbl-only' into 'master'
Split from !2455

References #9092

See merge request !2515
2016-01-20 14:25:40 -05:00
Robert SpeicherandRobert Speicher 96f12f57fc Merge branch 'fix-error-500-with-invalid-utf8' into 'master'
Gracefully handle invalid UTF-8 sequences in Markdown links

Closes #6077

See merge request !2382
2016-01-20 14:03:58 -05:00
Robert SpeicherandRobert Speicher 645f775081 Merge branch 'sentry-integration' into 'master'
Add sentry integration

Sentry is an event logging platform primarily focused on capturing and
aggregating exceptions. With this MR it will be possible to log and
track exceptions from GitLab to Sentry.

https://gitlab.com/gitlab-com/operations/issues/39

See merge request !2485
2016-01-20 14:01:23 -05:00
Dmitriy ZaporozhetsandRobert Speicher 84316761a6 Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master'
Fixes tooltip doesn't duplicate the "me" name.

Checks that "me" is not in the array of names in tooltip

![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978


See merge request !2454
2016-01-20 13:56:54 -05:00
Dmitriy ZaporozhetsandRobert Speicher f3683b6172 Merge branch 'secret-shortcut-feature' into 'master'
Adds "t" as a shortcut for find file anywhere



See merge request !2507
2016-01-20 13:51:36 -05:00
Douwe MaanandRobert Speicher efb883892e Merge branch 'ci/artifacts-remove-compressed-size' into 'master'
Remove `Compressed to` column from build artifacts browser

See #10982.

See merge request !2509
2016-01-20 13:46:21 -05:00
Robert SpeicherandRobert Speicher 5f192df811 Merge branch 'adjust-unicorn-memory-limits' into 'master'
Use ENV variables for Unicorn worker killer & increase default limits

Merge request that lead to this particular merge request:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2421

[ci skip]

See merge request !2513
2016-01-20 13:45:13 -05:00
Robert Speicher d3af84afb8 Update CHANGELOG
- Add attribution for Anton Baklanov
- Remove attributions for employees

[ci skip]
2016-01-19 16:46:10 -05:00
Robert SpeicherandRobert Speicher 74a6b4b633 Merge branch 'add_email_headers' into 'master'
Added X-GitLab-... headers to emails from CI and Email On Push services

Fixes #2098

This adds the 'X-GitLab-Project', 'X-GitLab-Project-Id' and
'X-GitLab-Project-Path' headers to emails from CI and Email On Push in a way
that it is done currently for merge requests and issues emails.

Additionally, CI emails will have 'X-GitLab-Build-Status' header with either
'fail' or 'success'.

Emails from Email On Push will include 'X-Gitlab-Author' header containing the
username of user who did the push.

See merge request !2159
2016-01-19 16:25:21 -05:00
Dmitriy ZaporozhetsandRobert Speicher 91af0864f1 Merge branch 'star-button-fork-count-increase' into 'master'
Starring project only increases star count

This is instead of increasing star & fork count

Fixes #11396

![star-count](/uploads/9a1d569393bc051d1a019f0340eec957/star-count.gif)

cc. @jschatz1 

See merge request !2504
2016-01-19 14:18:41 -05:00
Robert SpeicherandRobert Speicher a3a008f6b2 Merge branch 'user-ldap-email' into 'master'
Allow LDAP users to change their email if it was not set by the LDAP
server

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

See merge request !2502
2016-01-19 14:15:52 -05:00
Grzegorz BizonandRobert Speicher 6d0bf9d08f Merge branch 'fix/artifacts-double-propagation' into 'master'
Fix double request issue in artifacts browser

This fixed problem with double propagation when clicking a link that lies inside tr with clicked event attached.

See merge request !2496
2016-01-19 12:19:05 -05:00
Douwe MaanandRobert Speicher 52124655e1 Merge branch 'fix-consider-re-assign-as-a-mention' 2016-01-19 12:12:35 -05:00
Douwe MaanandRobert Speicher 21a2942daf Merge branch 'fix-project-creation' into 'master'
Creator should be added as a master of the project on creation

Fixes: #4222

See merge request !2463
2016-01-19 12:09:25 -05:00