home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 60b80541cd Merge pull request #8726 from jvanbaarsen/sidebar-colors-comment 
Also show colors in the sidebar of comment
 2015-02-04 14:47:57 -08:00
Dmitriy Zaporozhets fc13ea7137 Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint 
Added a way to retrieve MR files
 2015-02-04 14:46:54 -08:00
Dmitriy Zaporozhets 61d07eabfc Fix tests 2015-02-04 13:54:19 -08:00
Marin Jankovski 6ca23357c4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-04 09:12:02 -08:00
Marin Jankovski d685d45222 Merge branch 'consolidate_ssh_docs' into 'master' 
Consolidate SSH docs

The two available SSH topics were quite short, so it made sense to combine them.

Includes fixes a few missing words, punctuation.

See merge request !328
 2015-02-04 17:11:38 +00:00
Ewan Edwards 7aa3f6053e Consolidate the SSH topics into a single file, since the two 
available topics are quite short.

Also correct some missing words, punctuation.
 2015-02-04 08:23:24 -08:00
Douwe Maan f4ce0ddde4 Show image attachments in browser instead of downloading them. 
Resolves #1702.
 2015-02-04 15:35:10 +01:00
Jacob Vosmaer 46a4d371b6 Merge pull request #8661 from limansky/master 
Fixes #8478. Update timfel-krb5-auth to 0.8.2.
 2015-02-04 13:37:33 +01:00
Jeroen van Baarsen b60d06eb2c Added a way to retrieve MR files 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-04 10:24:25 +01:00
Marin Jankovski 56a456b43d Merge branch 'doc_cookbook_uses_omnibus' into 'master' 
Drop comments on cookbook installing from source now that it uses Omnibus.

gitlab-coockbook now uses Omnibus packages so raketasks are invoked via gitlab-rake

See merge request !318
 2015-02-04 05:28:10 +00:00
Dmitriy Zaporozhets f1ffed2637 Merge branch 'add_more_maintenance_tasks' into 'master' 
Add more maintenance tasks to documentation

See merge request !317
 2015-02-04 04:34:07 +00:00
Dmitriy Zaporozhets 347ce399ab Merge branch 'blame_encoding_error_fix' into 'master' 
Fix for a "500: Encoding error" in the blame view

What does this MR do?

- The change enforces UTF-8 encoding on the source line data obtained from the Git.

Are there points in the code the reviewer needs to double check?

- The fix might not be enough to fix all encoding error issues in the blame view. There might be similar encoding issues if there are non-UTF-8 encoded names, for example

Why was this MR needed?

- This change fixes the "500: encoding error" that I get when I try to view the Gitlab source CHANGELOG file.

What are the relevant issue numbers / Feature requests?

- Gitlab issue #894: https://gitlab.com/gitlab-org/gitlab-ce/issues/894

See merge request !298
 2015-02-04 04:32:48 +00:00
Dmitriy Zaporozhets a8b4756f29 Merge branch 'mwessel/gitlab-ce-configure-protection' into 'master' 
Mwessel/gitlab ce configure protection

See merge request !1467
 2015-02-04 04:25:07 +00:00
Dmitriy Zaporozhets 0bcd5ca4eb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-03 19:27:06 -08:00
Dmitriy Zaporozhets 3db8e4524d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-03 19:26:49 -08:00
Dmitriy Zaporozhets 655fbc6bdd Dont load rubocop in prod env 2015-02-03 19:25:57 -08:00
Dmitriy Zaporozhets 490cf7bfce Improve protected branches selectbox options 2015-02-03 18:12:20 -08:00
Dmitriy Zaporozhets 635ebac606 Merge branch 'master' into mwessel/gitlab-ce-configure-protection 2015-02-03 17:54:33 -08:00
Dmitriy Zaporozhets a424a44242 Merge branch 'remove_hidden_settings_text' into 'master' 
Remove hidden settings text on project settings

No need to have the hidden settings text anymore as the danger area is now unified.

See merge request !320
 2015-02-04 01:51:31 +00:00
Dmitriy Zaporozhets cb2093fb61 Merge pull request #8702 from m-a-r-c-o/raw-image-paste-fix 
Fix raw image paste from clipboard
 2015-02-03 17:49:15 -08:00
Sytse Sijbrandij 7b233ea853 Spelling improvement, add in a group, not into group. 2015-02-03 16:55:31 -08:00
Ewan Edwards ad6c372eee Fix a number of discovered typos, capitalization of developer and 
product names, plus a couple of instances of bad Markdown markup.
 2015-02-03 15:18:40 -08:00
Sytse Sijbrandij 21b742a027 Merge branch 'master' into 'master' 
Fix capitalization of URL.

A targeted fix in the documentation.

See merge request !323
 2015-02-03 23:12:40 +00:00
Dmitriy Zaporozhets 704922c855 Mention web hook imporvements 2015-02-03 15:07:01 -08:00
Dmitriy Zaporozhets ca0f107809 Merge branch 'webhook-rescue' into 'master' 
Webhook rescue Errno::ECONNRESET

Fixes #1821

See merge request !1466
 2015-02-03 22:42:28 +00:00
Dmitriy Zaporozhets a89d7adfa4 Rescue connection reset for web hooks 2015-02-03 13:57:28 -08:00
Dmitriy Zaporozhets 46dd5fc47e Merge branch 'jasonblanchard-collapseable-nav' into 'master' 
Collapseable sidebar

See merge request !1465
 2015-02-03 21:56:26 +00:00
Dmitriy Zaporozhets 254a63dcf7 Improve collapsing sidebar 2015-02-03 13:11:33 -08:00
Mike Limansky 4adf6389b0 Fixes #8478. Update timfel-krb5-auth to 0.8.3. 2015-02-03 23:40:56 +03:00
Dmitriy Zaporozhets ded30e3efe Merge branch 'collapseable-nav' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav 2015-02-03 12:05:11 -08:00
Dmitriy Zaporozhets d35070ead0 Merge branch 'push-it' into 'master' 
Push it

Spelling improvement

See merge request !1464
 2015-02-03 20:02:25 +00:00
Sytse Sijbrandij e0d85078ba Push can be multiple files. 2015-02-03 11:23:59 -08:00
Dmitriy Zaporozhets 8618277f24 Merge branch 'issue-merge-req-context-links' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-issue-merge-req-context-links 
Conflicts:
	CHANGELOG
 2015-02-03 11:22:16 -08:00
Dmitriy Zaporozhets 9e5f4aec6c Merge branch 'new-file-repo-docs' into 'master' 
Web editor documentation

Related to #1930

See merge request !1458
 2015-02-03 19:17:04 +00:00
Job van der Voort 68fbf1423f improve english documentation 2015-02-03 11:05:20 -08:00
Dmitriy Zaporozhets dc9bf32420 Merge pull request #8723 from jubianchi/api-groups-path 
Access groups using path
 2015-02-03 10:57:27 -08:00
Dmitriy Zaporozhets 141c6a027e Merge pull request #8719 from jvanbaarsen/diff-colors 
Made diff colors a little less In Your Face
 2015-02-03 10:36:53 -08:00
Dmitriy Zaporozhets e9fad8cfc3 Merge branch 'tune_commit_page' into 'master' 
Tune commit page: async load of branch info

See merge request !1462
 2015-02-03 18:26:01 +00:00
Jeroen van Baarsen 39bfe0aa1d Also show colors in the sidebar of comment 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-03 18:45:39 +01:00
Jeroen van Baarsen 0ef495734d Improved speed of the project_spec.rb 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-03 18:26:17 +01:00
Valery Sizov 19f39b4292 update changelog 2015-02-03 09:23:55 -08:00
Valery Sizov c8782e1a40 code folding 2015-02-03 09:22:56 -08:00
Valery Sizov b9d9ac82a9 Commit page: async load branches info 
Conflicts:
	config/routes.rb
 2015-02-03 09:10:56 -08:00
Jason Blanchard ee955d7a12 Adds persistent collapse button for left side bar 2015-02-03 11:45:33 -05:00
Jason Blanchard 97d4ac4047 Adds link to milestone and keeping resource context on smaller 
viewports for issues and merge requests
 2015-02-03 11:41:32 -05:00
Dmitriy Zaporozhets 7bf2036852 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-03 08:27:57 -08:00
jubianchi 4e97f26649 Acces groups with their path in API 2015-02-03 13:42:38 +01:00
Robert Schilling a073e00ab4 Merge pull request #8722 from Razer6/fix_gitlab_shell_version 
Update gitlab-shell to 2.4.2 for 7.7 install/update guide
 2015-02-03 12:18:11 +01:00
Robert Schilling 0e896aa9e9 Update gitlab-shell to 2.4.2 for 7.7 install/update guide 
closes #8718, closes #8721
 2015-02-03 11:44:55 +01:00
Jeroen van Baarsen ae5743e9c1 Made diff colors a little less In Your Face 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-03 10:50:10 +01:00