home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,122 Commits 48 Branches 340 Tags
bc2214da82082c0424048c433daf3aae65d80e7f
Commit Graph
23122 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis bc2214da82 Merge branch 'doc_codeblock_fix' into 'master' 
Fix broken codeblocks in ci/yaml documentation



See merge request !2554
 2016-01-22 11:35:27 +00:00
Achilleas Pipinellis 2254413267 Fix broken codeblocks in ci/yaml documentation 
[ci skip]
 2016-01-22 12:33:37 +01:00
Marin Jankovski a4a4643765 Merge branch 'changelog_master' into 'master' 
Remove 8.4 unreleased note from changelog



See merge request !2553
 2016-01-22 11:06:22 +00:00
Achilleas Pipinellis 865a82ebca Remove 8.4 unreleased note from changelog 
[ci skip]
 2016-01-22 11:53:59 +01:00
Achilleas Pipinellis 3695aace93 Merge branch 'fix_build_artifacts_doc' into 'master' 
Fix wording and appearance on build artifacts documentation



See merge request !2550
 2016-01-22 09:46:02 +00:00
Achilleas Pipinellis 49233288ea Fix wording and appearance on build artifacts documentation 
[ci skip]
 2016-01-22 10:44:27 +01:00
Achilleas Pipinellis f49a594079 Merge branch 'minor_fix_2fa_security' into 'master' 
Add image to 2fa security documentation



See merge request !2549
 2016-01-22 09:29:15 +00:00
Achilleas Pipinellis dba2e9c318 Add image to 2fa security documentation 
[ci skip]
 2016-01-22 10:23:32 +01:00
Achilleas Pipinellis 3e65fa5424 Merge branch 'doc_refactor_commits_api' into 'master' 
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
 2016-01-22 09:11:11 +00:00
Achilleas Pipinellis 373b277f03 Add note about commit status API deprecation 
[ci skip]
 2016-01-22 10:08:57 +01:00
Achilleas Pipinellis 831eb9468d Merge branch 'master' into doc_refactor_commits_api 2016-01-22 09:34:45 +01:00
Achilleas Pipinellis 8be4e54563 Merge branch 'issue/spelling' into 'master' 
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 😄 

See merge request !2519
 2016-01-22 07:43:06 +00:00
Robert Speicher 5f0d7e2e3b 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-22 07:39:33 +00:00
Robert Speicher 2fed8bf390 Merge branch 'fix-diff-comments' into 'master' 
More highlighted diff fixes

See merge request !2545
 2016-01-22 07:37:47 +00:00
Achilleas Pipinellis 87867018f3 Merge branch 'file_finder_doc_fixes' into 'master' 
Fix grammar and typos in file finder docs



See merge request !2547
 2016-01-22 07:33:42 +00:00
Achilleas Pipinellis de7ee6c37b Fix grammar and typos in file finder docs 
[ci skip]
 2016-01-22 08:26:48 +01:00
Robert Speicher 9a5f83a30a 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-22 01:35:39 +00:00
Douwe Maan 3db24ec9e8 Properly highlight right side of parallel diff 2016-01-22 02:12:43 +01:00
Douwe Maan 16d17b78ca Restore diff comments 2016-01-22 02:10:58 +01:00
Douwe Maan 82d0fa8e45 Fix 2016-01-22 01:53:01 +01:00
Douwe Maan 150b4f66e6 Make sure non-highlighted diffs are still escaped 2016-01-22 01:47:17 +01:00
Achilleas Pipinellis 3ae74df32d Merge branch 'fix_file_finder' into 'master' 
File finder can be invoked from anywhere!



See merge request !2543
 2016-01-21 23:26:45 +00:00
Achilleas Pipinellis 68ac1a6658 File finder can be invoked from anywhere! 
[ci skip]
 2016-01-22 00:23:20 +01:00
Robert Speicher 3f5e6c6cf6 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 23:23:02 +00:00
Robert Speicher 307b099064 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-21 23:16:22 +00:00
Achilleas Pipinellis 38c830ef0f 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 22:12:17 +00:00
Achilleas Pipinellis e08e90edbb Refactor housekeeping documentation 
[ci skip]
 2016-01-21 23:10:47 +01:00
Achilleas Pipinellis 308abc8db0 Merge branch 'master' into housekeeping-doc 2016-01-21 22:59:15 +01:00
Douwe Maan 9369b7ec1f Fix MR diff 'Edit' button 2016-01-21 22:46:49 +01:00
Achilleas Pipinellis c176fb40a5 Merge branch 'file_finder' into 'master' 
Add file finder documentation

Closes #7966 

See merge request !2541
 2016-01-21 21:40:52 +00:00
Achilleas Pipinellis 465e4616c9 Add file finder documentation 
[ci skip]
 2016-01-21 22:32:55 +01:00
Jacob Schatz 3f7993b5ce Merge branch 'drag-drop-cursor' into 'master' 
Milestone drag & drop cursor

Fixes #4097 

![grab-cursor](/uploads/f5071d7e4839c3b4b88c9f7f1270eee3/grab-cursor.gif)

cc @jschatz1 @creamzy 

See merge request !2532
 2016-01-21 20:06:09 +00:00
Achilleas Pipinellis 62d2182e41 Merge branch 'ci/build-artifacts-documentation' into 'master' 
Add basic documentation for build artifacts

/cc @axil @ayufan 

See merge request !2511
 2016-01-21 19:02:26 +00:00
Achilleas Pipinellis 53b1c04a02 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 19:00:51 +00:00
Achilleas Pipinellis dc5a20520a Fix typos, make things more clear 
[ci skip]
 2016-01-21 19:57:41 +01:00
Achilleas Pipinellis 93b942ec7c Refactor build artifacts documentation 
[ci skip]
 2016-01-21 17:27:23 +01:00
Grzegorz Bizon 3478030581 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 16:27:05 +00:00
Robert Speicher 7b78c52b07 Merge branch 'fix-permissions' into 'master' 
Remove execution permissions from font assets

[ci skip]

See merge request !2082
 2016-01-21 16:12:48 +00:00
Robert Speicher 0bf68c0cd5 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 16:07:21 +00:00
Douwe Maan 597d3bbe41 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 15:35:27 +00:00
Douglas Barbosa Alexandre 4861b1bbfb Fix import of GitHub's wiki when the repository has not been created 2016-01-21 13:11:38 -02:00
Grzegorz Bizon 66b0927bb5 Move build artifacts javascripts into separate file 2016-01-21 15:51:44 +01:00
Phil Hughes ad9799bdb0 Milestone drag & drop cursor 
Fixes #4097
 2016-01-21 14:17:59 +00:00
Douwe Maan 85fd6c861f Make dark inline diffs a little more obvious 2016-01-21 15:07:21 +01:00
Grzegorz Bizon e5232ccc1e Do not use progress bar when downloading build artifacts 
Closes #12491
 2016-01-21 15:06:32 +01:00
Douwe Maan b2c071fad4 Pretty highlighted diffs for every theme 2016-01-21 14:56:23 +01:00
Jacob Vosmaer 1c1590a510 Use gitlab-workhorse 0.6.1 2016-01-21 14:44:56 +01:00
Jacob Vosmaer ad6b6b9ede Mention init script update 2016-01-21 14:24:40 +01:00
Douwe Maan 21facf5353 Use consistent markup and styling for highlighting across blobs, diffs, blame and snippets 2016-01-21 14:23:53 +01:00
Jacob Vosmaer 693fa7a458 Init script changes for gitlab-workhorse in 8.4 2016-01-21 13:36:55 +01:00