home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 14:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
4716 Commits
Author SHA1 Message Date
Patricio Cano f60eb60473 Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't. 2015-09-22 16:26:59 -05:00
Kamil Trzcinski a42f418f18 Fix GitlabCiService specs 2015-09-22 18:28:08 +02:00
Robert Speicher c1399cbc66 Merge branch 'rs-fix-spec-warnings' into 'master' 
Ensure raise_error expectations provide arguments

See merge request !1381
 2015-09-21 20:54:14 +00:00
Robert Speicher ba71542a5a Merge branch 'fix-issue-2593' into 'master' 
Fix Error 500 when comparing non-existing branches

Closes #2593

See merge request !1355
 2015-09-21 20:46:15 +00:00
Robert Speicher d4acda1253 Merge branch 'rs-relative-link-up-one' into 'master' 
Allow relative links to go up one directory level

See merge request !1352
 2015-09-21 19:38:37 +00:00
Robert Speicher 2f88459297 Ensure raise_error expectations provide arguments 2015-09-21 15:35:29 -04:00
Robert Speicher d4a960161e Merge branch 'rename-reply-by-email' into 'master' 
Rename reply_by_email to incoming_email to prepare for the future.

Closes #2579.

See merge request !1367
 2015-09-21 18:52:13 +00:00
Stan Hu ea5c25bb4e Remove milestones from merge requests when milestones are deleted 
Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
 2015-09-21 07:00:55 -07:00
Douwe Maan 0c83349867 Merge branch 'master' into rename-reply-by-email 2015-09-21 10:35:56 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Dmitriy Zaporozhets 8bb3215d54 Merge branch 'fail-ci-builds-without-yml' into 'master' 
Fail ci builds without yml

Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551

See merge request !1349
 2015-09-21 07:49:18 +00:00
Douwe Maan 46173ec8ce Merge branch 'fix-markdown-links-in-dashboard' into 'master' 
Fix Markdown links not showing up in dashboard activity feed

Closes #2586

See merge request !1353
 2015-09-21 07:24:19 +00:00
Robert Speicher 2b94f5fb06 Allow RelativeLinkFilter to go up multiple directories 2015-09-20 19:21:33 -04:00
Kamil Trzcinski 8671343b65 Rubocop fix 2015-09-20 20:46:15 +02:00
Kamil Trzcinski 71a5d5a036 Fail builds if no .gitlab-ci.yml is found 2015-09-20 20:46:14 +02:00
Stan Hu 3b39b648d2 Fix Markdown links not showing up in dashboard activity feed 
Closes #2586
 2015-09-20 09:32:35 -07: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 259851c0d6 Bump devise-two-factor to 2.0.0 
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605

See https://github.com/tinfoil/devise-two-factor/pull/43
 2015-09-19 21:16:18 -04: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
Stan Hu de8497ca56 Fix Error 500 when comparing non-existing branches 
Closes #2593
 2015-09-18 12:02:01 -07:00
Robert Speicher 619f04c196 Allow relative links to go up one directory level 2015-09-18 14:03:42 -04: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 333463ddf2 Fix indentation 2015-09-18 16:37:21 +02:00
Francesco Levorato 1bbcc29687 Redirect case sensitive project path to the normalized one 2015-09-18 16:37:21 +02:00
Francesco Levorato 6bff207dfd Refactor spec to go through ApplicationController#project 2015-09-18 16:37:21 +02:00
Francesco Levorato 69cb5fba59 Make Project#find_with_namespace case-insensitive 2015-09-18 16:37:21 +02:00
Valery Sizov 3984818bb3 Merge branch 'ci_projects_order' into 'master' 
Fix: ci projects order

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

See merge request !1333
 2015-09-18 08:54:06 +00:00
Valery Sizov b7e49d8042 Fix: ci projects order 2015-09-17 20:12:17 +03:00
Stan Hu b75e4d7149 Merge pull request #9618 from pjknkda/repo-info-to-issue-hook 
add repository field to issue hook data
 2015-09-17 07:03:47 -07:00
Stan Hu f481637245 Merge branch 'fix-issue-2382' into 'master' 
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity

Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".

Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png)

Closes #2382

See merge request !1227
 2015-09-17 08:04:37 +00:00
Dmitriy Zaporozhets da3d35952d Merge branch 'restrict-user-api-integers' into 'master' 
Restrict users API endpoints to use integer IDs

Closes #2267

See merge request !1156
 2015-09-17 07:29:57 +00: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
Robert Speicher 09bcce7d1f Merge branch 'ldap-attributes' into 'master' 
Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261
 2015-09-16 18:34:55 +00: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 ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Stan Hu 1c289ac0c3 Fix broken sort in merge request API 
Closes #2266
 2015-09-15 22:55:22 -07:00
Kamil Trzcinski 2f2b9f67c2 Fix backup tests 2015-09-16 00:06:41 +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 e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
# Conflicts:
#	Gemfile.lock
 2015-09-15 22:40:35 +02:00
Kamil Trzcinski 7e2dbcbe09 Fix: models/ci/project_spec.rb once again 2015-09-15 22:36:25 +02:00
Kamil Trzcinski 0d23676f9d Fix: rubocop 2015-09-15 22:24:33 +02:00
Kamil Trzcinski 81d98112d4 Fix: tasks/gitlab/backup_rake_spec.rb 2015-09-15 22:21:51 +02:00
Kamil Trzcinski fe42de3a48 Fix: features/ci/admin/runners_spec.rb 2015-09-15 22:15:28 +02:00
Kamil Trzcinski 29b3279a95 Fix: features/ci/events_spec.rb once again 2015-09-15 22:04:42 +02:00