summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow empty Mysql password on CImysql-password-ciJacob Vosmaer2016-01-221-0/+3
|
* Merge branch 'changelog_master' into 'master' Marin Jankovski2016-01-221-1/+1
|\ | | | | | | | | | | | | Remove 8.4 unreleased note from changelog See merge request !2553
| * Remove 8.4 unreleased note from changelogAchilleas Pipinellis2016-01-221-1/+1
|/ | | | [ci skip]
* Merge branch 'fix_build_artifacts_doc' into 'master' Achilleas Pipinellis2016-01-221-5/+3
|\ | | | | | | | | | | | | Fix wording and appearance on build artifacts documentation See merge request !2550
| * Fix wording and appearance on build artifacts documentationAchilleas Pipinellis2016-01-221-5/+3
| | | | | | | | [ci skip]
* | Merge branch 'minor_fix_2fa_security' into 'master' Achilleas Pipinellis2016-01-222-4/+11
|\ \ | |/ |/| | | | | | | | | Add image to 2fa security documentation See merge request !2549
| * Add image to 2fa security documentationAchilleas Pipinellis2016-01-222-4/+11
|/ | | | [ci skip]
* Merge branch 'doc_refactor_commits_api' into 'master' Achilleas Pipinellis2016-01-222-84/+188
|\ | | | | | | | | | | | | | | | | Refactor commits API documentation Blocked by https://gitlab.com/gitlab-org/gitlab-ce/issues/10960 which needs to be fixed or documented. Closes #4217 See merge request !2465
| * Add note about commit status API deprecationAchilleas Pipinellis2016-01-222-2/+14
| | | | | | | | [ci skip]
| * Merge branch 'master' into doc_refactor_commits_apiAchilleas Pipinellis2016-01-22211-829/+3254
| |\ | |/ |/|
* | Merge branch 'issue/spelling' into 'master' Achilleas Pipinellis2016-01-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix a missing letter in the documentation. Hello, I just found a missing letter in the PHP CI configuration documentation. This MR allow to fix that :smile: See merge request !2519
| * | Fix a missing letter in the documentation.Stéphane HULARD2016-01-201-1/+1
| | |
* | | Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-224-29/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix MR diff 'Edit' button It now works and has the right size. See merge request !2542
| * | | Fix MR diff 'Edit' buttonfix-mr-diff-edit-buttonDouwe Maan2016-01-214-29/+27
| | | |
* | | | Merge branch 'fix-diff-comments' into 'master' Robert Speicher2016-01-223-6/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | More highlighted diff fixes See merge request !2545
| * | | | Properly highlight right side of parallel difffix-diff-commentsDouwe Maan2016-01-221-1/+3
| | | | |
| * | | | Restore diff commentsDouwe Maan2016-01-222-5/+7
| |/ / /
* | | | Merge branch 'file_finder_doc_fixes' into 'master' Achilleas Pipinellis2016-01-221-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix grammar and typos in file finder docs See merge request !2547
| * | | | Fix grammar and typos in file finder docsAchilleas Pipinellis2016-01-221-6/+7
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'unescaped-diffs' into 'master' Robert Speicher2016-01-223-8/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
| * | | | FixDouwe Maan2016-01-221-2/+2
| | | | |
| * | | | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-223-8/+20
| |/ / /
* | | | Merge branch 'fix_file_finder' into 'master' Achilleas Pipinellis2016-01-211-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File finder can be invoked from anywhere! See merge request !2543
| * | | | File finder can be invoked from anywhere!Achilleas Pipinellis2016-01-221-5/+8
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | 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
| * | | | | Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entriesKamil Trzcinski2016-01-207-19/+46
| | | | | |
* | | | | | Merge branch 'diff-highlight-themes' into 'master' Robert Speicher2016-01-2121-268/+237
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff highlight themes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484 See merge request !2530
| * | | | | Make dark inline diffs a little more obviousdiff-highlight-themesDouwe Maan2016-01-211-2/+2
| | | | | |
| * | | | | Pretty highlighted diffs for every themeDouwe Maan2016-01-215-20/+37
| | | | | |
| * | | | | Use consistent markup and styling for highlighting across blobs, diffs, ↵Douwe Maan2016-01-2121-260/+212
| | | | | | | | | | | | | | | | | | | | | | | | blame and snippets
* | | | | | 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
| * | | | | | Refactor housekeeping documentationAchilleas Pipinellis2016-01-212-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Merge branch 'master' into housekeeping-docAchilleas Pipinellis2016-01-21535-2472/+9542
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'file_finder' into 'master' Achilleas Pipinellis2016-01-214-0/+43
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add file finder documentation Closes #7966 See merge request !2541
| * | | | | | Add file finder documentationAchilleas Pipinellis2016-01-214-0/+43
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'drag-drop-cursor' into 'master' Jacob Schatz2016-01-211-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Milestone drag & drop cursor Fixes #4097 ![grab-cursor](/uploads/f5071d7e4839c3b4b88c9f7f1270eee3/grab-cursor.gif) cc @jschatz1 @creamzy See merge request !2532
| * | | | | | Milestone drag & drop cursorPhil Hughes2016-01-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4097
* | | | | | | 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
| * | | | | | | Refactor build artifacts documentationci/build-artifacts-documentationAchilleas Pipinellis2016-01-216-52/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Add basic documentation for build artifactsGrzegorz Bizon2016-01-203-0/+52
| | | | | | | |
* | | | | | | | 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
| * | | | | | | | Fix typos, make things more clearAchilleas Pipinellis2016-01-211-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Link to restart_gitlab.md and some more fixesdoc_restart_gitlabAchilleas Pipinellis2016-01-201-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Add document on restarting GitLabAchilleas Pipinellis2016-01-203-0/+150
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | 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
| * | | | | | | | Move build artifacts javascripts into separate filefix/artifacts-download-progress-barGrzegorz Bizon2016-01-213-13/+16
| | | | | | | | |
| * | | | | | | | Do not use progress bar when downloading build artifactsGrzegorz Bizon2016-01-211-1/+5
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #12491
* | | | | | | | Merge branch 'fix-permissions' into 'master' Robert Speicher2016-01-2126-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove execution permissions from font assets [ci skip] See merge request !2082
| * | | | | | | | remove execution permissions from fontsPirate Praveen2016-01-2125-0/+0
| | | | | | | | |
| * | | | | | | | add execution permission for scriptPirate Praveen2016-01-211-0/+0
| |/ / / / / / /
View Lorry Controller Status