home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,522 Commits 48 Branches 340 Tags
697b34d786bcbc9b4fdaef485ff4837b850ca5aa
Commit Graph
696 Commits
Author SHA1 Message Date
Kamil Trzcinski 29a7c6796e Fix GitLabCiService and remove ci_yaml_file from CI push data 2015-10-05 16:06:35 +02:00
Kamil Trzcinski c985389722 Add stage tests 2015-10-05 15:59:31 +02:00
Kamil Trzcinski f42078f7c1 Fix rest of tests 2015-10-05 14:31:51 +02:00
Kamil Trzcinski 0367dbf043 Fix build pipelining 2015-10-05 14:15:15 +02:00
Kamil Trzcinski d2d2df0738 Fix next round of tests 2015-10-05 13:12:00 +02:00
Kamil Trzcinski 317a746954 Make commit_spec run 2015-10-05 12:02:26 +02:00
Guilherme Garnier 1cfb48ddd0 Merge remote-tracking branch 'upstream/master' 2015-10-03 11:46:29 -05:00
Guilherme Garnier 848d7b2a2b Fix rubocop warnings in spec/models 2015-10-03 01:48:54 -05:00
Dmitriy Zaporozhets 0e7b96bf48 Merge branch 'access_level_badge_bug' into 'master' 
Fix: Wrong access level badge on MR comments

https://gitlab.com/gitlab-org/gitlab-ce/issues/2654

See merge request !1501
 2015-10-02 14:39:58 +00:00
Douwe Maan 93522e59ec Merge branch 'rs-throttle-reset' into 'master' 
Throttle "Forgot your password?" emails

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611

See merge request !1476
 2015-10-02 14:37:07 +00:00
Valery Sizov 97e6c9b42c Wrong access level badge on MR comments 2015-10-02 15:11:17 +03:00
Dmitriy Zaporozhets 3515cb9b2d Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-02 11:02:05 +02:00
Dmitriy Zaporozhets 5de0b07844 Prevent creating 2 Ci::Project entities when enable CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-02 10:08:16 +02:00
Robert Speicher d40dd5cfe3 Conform to spec guidelines that only exist in my head 
[ci skip]
 2015-10-02 00:14:47 -04:00
Robert Speicher ad7ad8745a Add User#recently_sent_password_reset? 2015-10-01 21:41:56 -04:00
Douwe Maan 96c2e22549 Merge branch 'disable-report-button-if-already-reported' into 'master' 
Disable the "Report abuse" button if a user has already been reported

Hello,

I've implemented the feature request #2330. Here is what it looks like:

![report-abuse-button-disabled](https://gitlab.com/rymai/gitlab-ce/uploads/420d51906eac1c40c50701a0a340474f/report-abuse-button-disabled.png)

I hope that's an acceptable solution.

cc @DouweM

See merge request !1456
 2015-10-01 13:17:18 +00:00
Kamil Trzciński 114853063b Merge branch 'ci-fixes' into 'master' 
CI: Fix clone url and fix project token removal

- Fixes broken CI clone url on dev.gitlab.org
- Fixes regression in CI token removal

/cc @vsizov @dzaporozhets 



See merge request !1481
 2015-10-01 12:59:39 +00:00
Douwe Maan 41b08e4a08 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-10-01 12:34:32 +02:00
Douwe Maan 7c7b664c01 Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookup 2015-10-01 12:33:51 +02:00
Kamil Trzcinski 0e54847339 Fix: CI token removal regression from build trace 2015-10-01 11:43:06 +02:00
Kamil Trzcinski b9ccc79cb5 Delegate ci_project parameters to projects 
- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.
 2015-09-30 12:48:40 +02:00
Rémy Coutable ea72d53ec0 Streamline the "Report button" 
This simplifies the "Report button" to not use open a dropdown and
adds a tooltip on this button.
This also removes an extra spec and adds missing specs.
 2015-09-29 21:47:01 +02:00
Rémy Coutable 5f95a5e070 Disable the "Report abuse" button if a user has already been reported 2015-09-29 21:11:51 +02:00
Kamil Trzcinski 0d877d91e7 Make ensure_gitlab_ci_project return ci_project or create a new one 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0f3deac362 Fix tests 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0fa4ab5fd8 Rename commits to ci_commits 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 8f8efcfa00 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 0e33814708 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 30c78e70cb WIP 2015-09-29 10:47:03 +02:00
Dmitriy Zaporozhets fd39414408 Merge branch 'remove-routes-helper' into 'master' 
Fix Slack notification URL and remove the usage of Ci::RoutesHelper

Fix for #2644

/cc @dzaporozhets @rspeicher 

See merge request !1391
 2015-09-24 09:53:04 +00:00
Dmitriy Zaporozhets 2eb9a20f36 Enable CI for gitlab when .gitlab-ci.yml is pushed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 13:11:40 +02:00
Dmitriy Zaporozhets 21dfaa000d Show CI status on all pages where commits list is rendered 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 12:23:04 +02:00
Kamil Trzcinski a42f418f18 Fix GitlabCiService specs 2015-09-22 18:28:08 +02:00
Robert Speicher 2f88459297 Ensure raise_error expectations provide arguments 2015-09-21 15:35:29 -04:00
Douwe Maan 9be1c08e5d Merge branch 'jwt' into 'master' 
Removed format validation

**What does this MR do?**

Removals format validation for drone token

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

Nothing

**Why was this MR needed?**

because drone migrated to JWT tokens and JWT token doesn't valid with current format ( i don't know how many symbols JWT can use for this )

See merge request !1359
 2015-09-20 15:19:33 +00:00
Robert Speicher 69723d2002 Devise 3.5.x deprecates confirm! in favor of confirm 2015-09-19 21:15:13 -04:00
Kirilll Zaitsev 9021200ad3 Removed format validation 2015-09-19 14:12:20 +03:00
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Valery Sizov 600d6eeff3 Fix CI status in the MR page 2015-09-18 18:02:29 +03:00
Francesco Levorato 69cb5fba59 Make Project#find_with_namespace case-insensitive 2015-09-18 16:37:21 +02:00
Jungkook Park e4ac2d582c add repository field to issue hook data 
add a test for to_hook_data of issue model

update CHANGELOG
 2015-09-17 05:33:37 +09:00
Kamil Trzcinski 2b20603f5a Make rubocop happy 2015-09-16 17:30:15 +02:00
Kamil Trzcinski 7ea48ec546 Fix CI tests 2015-09-16 17:20:00 +02:00
Kamil Trzcinski 912f470497 Fix ordering issue 2015-09-16 16:59:54 +02:00
Kamil Trzcinski 416d98b497 Fix: models/ci/project_spec.rb once again 2015-09-15 23:42:57 +02:00
Kamil Trzcinski 2d8c4273ef Fix models/ci/mail_service_spec.rb 
- Change Notify to Ci::Notify
- Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
 2015-09-15 23:18:52 +02:00
Kamil Trzcinski 757fdd34dc Revert "Fix: models/ci/mail_service_spec.rb" 
This reverts commit 345ff6cbf9.

This requires sidekiq >= 3.4 and fixed all other CE tests
 2015-09-15 23:09:04 +02:00
Kamil Trzcinski 7e2dbcbe09 Fix: models/ci/project_spec.rb once again 2015-09-15 22:36:25 +02:00
Kamil Trzcinski 874166d80f Fix models/ci/web_hook_spec.rb 2015-09-15 22:01:31 +02:00
Kamil Trzcinski 8d5c9935ff Fix: models/ci/project_spec.rb 2015-09-15 22:00:17 +02:00