summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Merge branch 'rails_update' into 'master' Valery Sizov2016-01-252-31/+31
| | | | | | | | | 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
* Merge branch 'solarized-dark-old-lines' into 'master' Robert Speicher2016-01-221-1/+1
| | | | | | | 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
* Merge branch 'diff-highlight-themes' into 'master' Robert Speicher2016-01-2221-268/+237
| | | | | | | Diff highlight themes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484 See merge request !2530
* Merge branch 'mysql-password-ci' into 'master' Kamil Trzciński2016-01-221-1/+10
| | | | | | | Allow empty Mysql password on CI [ci skip] See merge request !2558
* Merge branch 'fix-error-500-mr-search' into 'master' Dmitriy Zaporozhets2016-01-221-1/+1
| | | | | | | Fix Error 500 when doing a search for merge requests Potential fix for #11547 See merge request !2525
* GitLab 8.4 uses gitlab-shell v2.6.10Julian Rademacher2016-01-221-1/+1
|
* Merge branch 'changelog_fix' into '8-4-stable' Marin Jankovski2016-01-221-1/+1
|\ | | | | | | | | | | | | Remove unreleased note from changelog (8-4-stable) See merge request !2556
| * Remove unreleased note from changelogAchilleas Pipinellis2016-01-221-1/+1
|/ | | | [ci skip]
* Version 8.4.0v8.4.0Marin Jankovski2016-01-221-1/+1
|
* Merge branch 'file_finder_doc_fixes' into 'master' Achilleas Pipinellis2016-01-211-6/+7
| | | | | | | Fix grammar and typos in file finder docs See merge request !2547
* Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-214-29/+27
| | | | | | | Fix MR diff 'Edit' button It now works and has the right size. See merge request !2542
* Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-213-6/+10
| | | | | More highlighted diff fixes See merge request !2545
* Merge branch 'unescaped-diffs' into 'master' Robert Speicher2016-01-213-8/+20
| | | | | | | Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
* Merge branch 'fix_file_finder' into 'master' Achilleas Pipinellis2016-01-211-5/+8
| | | | | | | File finder can be invoked from anywhere! See merge request !2543
* Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-217-19/+46
| | | | | Add method to calculate total size of artifacts in subpath See merge request !2500
* Merge branch 'file_finder' into 'master' Achilleas Pipinellis2016-01-214-0/+43
| | | | | | | Add file finder documentation Closes #7966 See merge request !2541
* Merge branch 'fix/artifacts-download-progress-bar' into 'master' Grzegorz Bizon2016-01-213-10/+17
| | | | | | | Do not use progress bar when downloading build artifacts Closes #12491 See merge request !2531
* Merge branch 'ci/cache-key' into 'master' Douwe Maan2016-01-214-8/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'housekeeping-doc' into 'master' Achilleas Pipinellis2016-01-213-0/+23
| | | | | | | Add housekeeping feature documentation Add documentation about the new housekeeping feature in the project settings page. See merge request !2371
* Merge branch 'ci/build-artifacts-documentation' into 'master' Achilleas Pipinellis2016-01-215-0/+175
| | | | | | | Add basic documentation for build artifacts /cc @axil @ayufan See merge request !2511
* Merge branch 'doc_restart_gitlab' into 'master' Achilleas Pipinellis2016-01-213-0/+164
| | | | | | | | Add documentation on restarting GitLab This will save as time from writing the same commands over and over again. See merge request !2510
* Merge branch 'fix-permissions' into 'master' Robert Speicher2016-01-2126-0/+0
| | | | | | | Remove execution permissions from font assets [ci skip] See merge request !2082
* Merge branch 'workhorse-path' into 'master' Robert Speicher2016-01-214-9/+12
| | | | | | | | | | | 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
* Merge branch 'fix-github-wiki-import' into 'master' Douwe Maan2016-01-211-2/+6
| | | | | | | Fix import of GitHub's wiki when the repository has not been created Fixes #12503 See merge request !2533
* Version 8.4.0-rc3v8.4.0-rc3Marin Jankovski2016-01-211-1/+1
|
* Merge branch 'fix-project-creation' into 'master' Robert Speicher2016-01-202-2/+7
| | | | | | | | | | | 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
* Remove Performance Monitoring from Integration docsRobert Speicher2016-01-201-1/+0
| | | | [ci skip]
* Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-202-10/+23
| | | | | | | Fix cross projects detection when importing GitHub pull requests Fixes #12456 See merge request !2523
* Merge branch 'metrics-documentation' into 'master' Achilleas Pipinellis2016-01-207-0/+384
| | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'issue_3945' into 'master'Robert Speicher2016-01-2050-392/+1152
| | | | | | | | Add syntax highlighting to diff view Closes #3945 See merge request !2109
* Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-2010-1/+242
| | | | | | | | Split from !2455 References #9092 See merge request !2515
* Merge branch 'fix-error-500-with-invalid-utf8' into 'master' Robert Speicher2016-01-202-0/+3
| | | | | | | Gracefully handle invalid UTF-8 sequences in Markdown links Closes #6077 See merge request !2382
* Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-2010-1/+76
| | | | | | | | | | | 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