home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,606 Commits 48 Branches 340 Tags
9353db59a084a1524c19efba2ef185a15967f233
Commit Graph
12606 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
skv 9353db59a0 remove unused js 2014-11-06 22:34:41 +03:00
Dmitriy Zaporozhets 68850b73d7 Merge branch 'improve-white-code-highlight' into 'master' 
Improve white code highlight in comments and wiki

![Screenshot 2014-11-05 16.36.55](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/5723848593/Screenshot_2014-11-05_16.36.55.png)

See merge request !1241
 2014-11-06 14:54:15 +00:00
Dmitriy Zaporozhets f5c89b2194 Merge branch 'mentioned_inside_mr' into 'master' 
Do not mention MR if commit is a part of MR

See merge request !1242
 2014-11-06 14:53:30 +00:00
Dmitriy Zaporozhets 265d624f9b Merge branch 'master' into improve-white-code-highlight 2014-11-06 15:39:02 +02:00
Dmitriy Zaporozhets 150fc0cc68 Merge branch 'master' into mentioned_inside_mr 2014-11-06 15:38:09 +02:00
Valery Sizov 08c04bc95e Merge branch 'fix_system_call' into 'master' 
Fix system_silent call

Origin request has been provided by our contributor @cirosantilli. We had to revert it and rework.

origin commit - https://dev.gitlab.org/gitlab/gitlabhq/commit/0b1084a4538bc46684c8620410988d3b1093e7ab

See merge request !1243
 2014-11-06 11:30:12 +00:00
Valery Sizov bf8b874117 fix system silent call 2014-11-06 13:07:42 +02:00
Valery Sizov d1b489e048 Revert "Revert "Don't output to stdout from lib non-interactive methods"" 
This reverts commit b33d4bc2f1.
 2014-11-06 13:07:16 +02:00
Valery Sizov b33d4bc2f1 Revert "Don't output to stdout from lib non-interactive methods" 
This reverts commit 0b1084a453.
 2014-11-06 11:58:00 +02:00
Dmitriy Zaporozhets 0ce1826b44 Merge pull request #8258 from cirosantilli/factor-repo-path 
Factor using Repository#path_to_repo
 2014-11-06 10:57:05 +02:00
Dmitriy Zaporozhets 6d60762793 Merge branch 'gitlab-ci-parallel' into 'master' 
Update GitLab CI service to work with new GitLab CI

See merge request !1239
 2014-11-05 17:42:52 +00:00
Dmitriy Zaporozhets 57c7dafbfe Light gray bg for white code scheme if used in comments and wiki 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-05 19:11:29 +02:00
Ciro Santilli e4a38e4471 Factor using Repository#path_to_repo 2014-11-05 17:51:49 +01:00
Dmitriy Zaporozhets c3e83d4771 Merge branch 'auth_duplication' into 'master' 
Remove unnecessary authorisations

Because we already check read_project ability in `before_filter :project`

See merge request !1240
 2014-11-05 15:23:26 +00:00
Marin Jankovski 6d775ddae4 Fix tests after change to regex validation message. 2014-11-05 16:03:45 +01:00
Valeriy Sizov f9814bf288 Merge pull request #8094 from cirosantilli/rm-unused-authenticate_user 
Remove unused authenticate_user from project#show
 2014-11-05 16:31:11 +02:00
Valeriy Sizov 5715df2067 Merge pull request #8233 from cirosantilli/rm-new-branch-dead 
Remove dead Event#new_branch? method
 2014-11-05 16:25:35 +02:00
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
Dmitriy Zaporozhets 4a41d4b7d2 Modify tests to match new gitlab_ci_service logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-05 16:21:35 +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
Marin Jankovski 2ee1ec4300 Do not allow cross reference note in a mr if a mr contains mentioned commit. 2014-11-05 12:53:10 +01: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
Marin Jankovski 5a8ec1f671 Create a failing test where commit in mr creates a mr mention note. 2014-11-05 12:18:26 +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
Dmitriy Zaporozhets 3246ed514f Update GitLab CI service to work with new GitLab CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-05 11:44:40 +02:00
Valery Sizov 6f34d40436 remove auth duplication 2014-11-05 11:04:08 +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
Ciro Santilli c49cb40f65 Remove dead Event#new_branch? method 2014-11-03 20:17:02 +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