home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 13:16:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,582 Commits 48 Branches 340 Tags
2b00de710d03cfbd225609fbca4e5d2c2e8968db
Commit Graph
12582 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valeriy Sizov 2b00de710d Merge pull request #8236 from cirosantilli/rm-lib-stdout 
Don't output to stdout from lib non-interactive methods [failure unrelated]
 2014-11-05 16:24:50 +02:00
Valeriy Sizov b0b234f739 Merge pull request #8234 from cirosantilli/factor-0000 
Factor '0' * 40 blank ref constants [failure unrelated]
 2014-11-05 16:20:56 +02:00
Valeriy Sizov 70122e46c8 Merge pull request #7903 from cirosantilli/test-seed-reset 
Fix version of test seed branches to specific revisions. Only clone if necessary.
 2014-11-05 15:22:37 +02:00
Marin Jankovski cb7db6d287 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-11-05 14:08:49 +01:00
Marin Jankovski d59f8abea5 Fix tests after change to regex validation message. 2014-11-05 13:58:51 +01:00
Valeriy Sizov f84772875e Merge pull request #7863 from cirosantilli/rm-blob-link-to-button 
Transform remove blob link into button.
 2014-11-05 14:09:32 +02:00
Valeriy Sizov 81613f965f Merge pull request #7848 from bbodenmiller/patch-1 
improve SSH key emails
 2014-11-05 14:06:14 +02:00
Valeriy Sizov 46bd0a88dd Merge pull request #7652 from m-a-r-c-o/logrotate-error-bugfix 
Fix log rotate permission error
 2014-11-05 13:50:11 +02:00
Ciro Santilli 0b1084a453 Don't output to stdout from lib non-interactive methods 
It pollutes the test output too much.
 2014-11-05 12:35:33 +01:00
Valeriy Sizov c8e78d972a Merge pull request #7495 from polamjag/fix-date-format-on-system-hook 
Use xmlschema date format (ISO 8601) on system hooks timestamp
 2014-11-05 13:14:26 +02:00
Valeriy Sizov b37b71d887 Merge pull request #7349 from srna/patch-1 
Attachment URL with non-/ relative root
 2014-11-05 13:11:51 +02:00
Marin Jankovski 42a1d8083c Merge pull request #7516 from cirosantilli/update-regex-msg 
Update default regex message to match regex.
 2014-11-05 11:38:29 +01:00
Valeriy Sizov 5c6b21f1c2 Merge pull request #7967 from Bugagazavr/issue-actor 
Add issueable actor to hooks
 2014-11-05 12:10:50 +02:00
Robert Schilling 652f4c8090 Merge pull request #8222 from cirosantilli/concat-with-backslash 
Continue strings with backslash instead of append
 2014-11-04 16:43:59 +01:00
Valeriy Sizov 0269cd3a27 Merge pull request #8182 from cirosantilli/dry-css-behavior 
Factor behaviors.scss constants
 2014-11-04 17:39:39 +02:00
Valeriy Sizov ed68797672 Merge pull request #8196 from bbodenmiller/patch-12 
clarify that 'template1=#' is part of prompt
 2014-11-04 17:37:46 +02:00
Valeriy Sizov f8981e02cd Merge pull request #8197 from bbodenmiller/patch-14 
Quit the database session at end of database setup
 2014-11-04 17:34:30 +02:00
Valeriy Sizov 24276ed836 Merge pull request #8224 from liammonahan/master 
Expose projects_limit through users API if UserFull.
 2014-11-04 17:33:20 +02:00
Robert Schilling 9cf50550d7 Merge pull request #8241 from cirosantilli/rm-unneeded-backslash 
Remove unneeded backslash: "\/" == "/"
 2014-11-04 14:03:50 +01:00
Ciro Santilli a56d0d47db Remove unneeded backslash: "\/" == "/" 2014-11-04 11:16:53 +01:00
Dmitriy Zaporozhets 876c6f2491 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-11-04 10:48:38 +02:00
Dmitriy Zaporozhets 5cab9d6fd8 Merge branch 'jastkand/gitlab-ce-fix-api-auth' into 'master' 
Jastkand/gitlab ce fix api auth

Fixes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/209

See merge request !1232
 2014-11-04 08:47:18 +00:00
Dmitriy Zaporozhets 11357c8bb2 Merge pull request #8231 from cirosantilli/0000 
Fix push not allowed to protected branch if  commit starts with 7 zeros.
 2014-11-04 00:13:58 +02:00
Ciro Santilli 71ed0ab069 Fix push not allowed to protected branch if 
commit starts with 7 zeros.
 2014-11-03 20:37:47 +01:00
Ciro Santilli c3be1517ae Factor '0' * 40 blank ref constants 2014-11-03 20:37:08 +01:00
Dmitriy Zaporozhets e1c48f1431 Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-03 14:10:53 +02:00
Dmitriy Zaporozhets d7c50b4a95 Merge branch 'api-events-username' into 'master' 
Expose author username in project events API

Fixes gitlab/gitlabhq#1476

See merge request !1236
 2014-11-03 11:52:33 +00:00
Marin Jankovski fe610ff576 Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_url 
update slack-notifier for new webhook_url format
 2014-11-03 09:57:05 +01:00
Liam Monahan 2edf212a8b Expose projects_limit through users API if UserFull. 2014-11-02 18:51:34 -05:00
Robert Schilling 1b1403804e Merge pull request #8223 from cirosantilli/slack-require-spec-helper 
Use require spec_helper instead of relative path
 2014-11-02 10:09:29 +01:00
Robert Schilling 4d23e840d3 Merge pull request #8209 from naveda89/patch-1 
Fixed markdown error in 7.3-to-7.4 update guide
 2014-11-02 10:08:03 +01:00
Ciro Santilli ffa586061d Use require spec_helper instead of relative path 
More portable if either test or class gets moved,
more uniform with the rest of the tests.
 2014-11-01 22:30:46 +01:00
Ciro Santilli 54ded5d95b Continue strings with backslash instead of append 2014-11-01 22:26:12 +01:00
Robert Schilling e9171fea85 Merge pull request #8217 from bbodenmiller/change-label-generation 
remove feature label
 2014-11-01 10:38:25 +01:00
Ben Bodenmiller 3e55d56c90 remove feature label 
For automatic label generation remove label `feature` as it is basically means the same thing as label `enhancement`.
 2014-10-31 17:22:16 -07:00
Robert Schilling dae7b941f6 Merge pull request #8213 from cirosantilli/factor-backend-shell-path 
Factor lib backend gitlab shell path
 2014-10-31 13:40:31 +01:00
Robert Schilling 394646670b Merge pull request #8211 from cirosantilli/rake-import-style 
Fix doc rake import md style [ci-skip]
 2014-10-31 13:38:54 +01:00
Ciro Santilli d549a2a525 Factor lib backend gitlab shell path 2014-10-31 13:00:50 +01:00
Ciro Santilli 884e916fe2 Fix doc rake import md style [ci-skip] 2014-10-31 12:51:53 +01:00
Alvaro Naveda 76e3b8c659 Fixed markdown error in 7.3-to-7.4 update guide 
Just fixed a minor bug in the markdown notation
 2014-10-31 11:55:56 +01:00
Dmitriy Zaporozhets 7371c9e2f4 Merge branch 'better-service-migration' into 'master' 
Better service migration

Prevent crashes and saving invalid record. Skip non-valid services.

Better fix for https://github.com/gitlabhq/gitlabhq/pull/8199

See merge request !1235
 2014-10-31 10:16:42 +00:00
Dmitriy Zaporozhets 9b251bd1cc Update changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-31 12:10:19 +02:00
Dmitriy Zaporozhets ef9f8677e6 Expose author username in project events API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-31 12:08:45 +02:00
Dmitriy Zaporozhets 80059cb523 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-31 11:39:17 +02:00
Dmitriy Zaporozhets aa75a755ee Merge branch 'api-delete-branch-json' into 'master' 
Api delete branch json

Fixes gitlab/gitlabhq#1478

See merge request !1233
 2014-10-31 09:38:24 +00:00
Dmitriy Zaporozhets 1bfba5df22 Merge pull request #8205 from CromFr/master 
Doc: Unicorn minimum worker_processes is 2
 2014-10-31 11:26:42 +02:00
Dmitriy Zaporozhets ff48e1eeb7 Save only valid record in service migrations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-31 11:12:41 +02:00
Sytse Sijbrandij 5a699090cd Merge branch 'improve_rake_import_doc' into 'master' 
Improve import Documentation

Improved the documentation steps for importing bare git repositories to GitLab.

@dzaporozhets I added a step to create gitlab-satellites. Is this step really necessary, or do the satellites get created as needed?

See merge request !1234
 2014-10-30 22:51:41 +00:00
Crom (Thibaut CHARLES) 3c9bf8a322 Doc: Unicorn minimum worker_processes is 2 
A value of 1 cause http push fail (issue #6978 on GitHub)
 2014-10-30 23:41:45 +01:00
Patricio Cano 2022754d93 Modified according to suggestions by @sytse 2014-10-30 17:36:25 -05:00