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
13,847 Commits 48 Branches 340 Tags
0bcd5ca4ebfe4901aab8a74f58d0599883f709bd
Commit Graph
13847 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
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
Dmitriy Zaporozhets 863f3873bc Merge branch 'rubycop-improvements' into 'master' 
Rubycop improvements

See merge request !1463
 2015-02-03 08:17:31 +00:00
Dmitriy Zaporozhets 61cc6a9244 Rubocop: indentation fixes Yay!!! 2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets d04344373b Rubocop: no trailing newlines 2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets 615bb94135 Rubocop: Dont allow puts or print to stdout 2015-02-02 21:41:38 -08:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets 7d48205c1a Rubocop: comment indentation 2015-02-02 21:34:16 -08:00
Dmitriy Zaporozhets 7558fe9875 More rubocop rules enable 2015-02-02 21:31:03 -08:00
Dmitriy Zaporozhets 368e9a0862 Rubocop: Style/CaseIndentation enabled 2015-02-02 21:26:40 -08:00
Dmitriy Zaporozhets 8c577a5771 Merge branch 'rubocop-spaces-hash' into 'master' 
Rubocop enabled for: Use spaces inside hash literal braces

See merge request !1461
 2015-02-03 05:23:22 +00:00
Dmitriy Zaporozhets da884aabc7 Avoid using {...} for multi-line blocks 2015-02-02 21:22:57 -08:00
Dmitriy Zaporozhets 6579c336f9 Rubocop: Ascii restrictions 2015-02-02 21:20:34 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets c427bf08e4 Rubocop: Style/AlignArray enabled 2015-02-02 20:58:28 -08:00
Dmitriy Zaporozhets 9fbdbf8b3f Rubocop: Style/Alias enabled 2015-02-02 20:57:10 -08:00
Dmitriy Zaporozhets aaae5e6f5e Rubocop: Style/AccessorMethodName enabled 2015-02-02 20:55:05 -08:00
Dmitriy Zaporozhets 832b63b538 Merge branch 'ruby-hash-1-9' into 'master' 
Ruby hash 1.9 with rubycop check

See merge request !1460
 2015-02-03 04:48:32 +00:00
Dmitriy Zaporozhets e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets 84a5a548a5 Add rubocop to rake test and rake test_ci 2015-02-02 20:08:23 -08:00
Dmitriy Zaporozhets afb8ecc3d1 Fix syntax error 2015-02-02 20:02:46 -08:00