home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
463 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 9a44d6977a Merge branch 'master' into decouple-member-notification 2016-04-11 10:34:49 -03:00
connorshea fb8afae186 Apparently I missed updating the schema.rb when removing the Twitter "Congrats" button 
From commit 85cc172959
 2016-04-09 11:28:47 -06:00
Douglas Barbosa Alexandre 99067a505c Fix schema.rb 2016-04-08 18:46:46 -03:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Zeger-Jan van de Weg 1e7116b34d Exclude projects pending deletion from all results 2016-03-31 20:20:18 +02:00
Douglas Barbosa Alexandre db36ef60e9 Remove todos for deleted merge requests 2016-03-31 10:46:06 -03:00
Douglas Barbosa Alexandre 9b93f8adc8 Destroy related todos when an issue is deleted 2016-03-30 12:09:34 -03:00
Dmitriy Zaporozhets 855b2820c1 Improve db migrations for notification settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 73c5a34105 Migrate notification setting from members table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 31b0e53015 Introduce NotificationSetting model 
It will hold notification setting per group or per project. It will
allow get rid of notification level stored in Member model

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Douwe Maan 31266c5be4 Address feedback 2016-03-22 00:09:20 +01:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
Felipe Artur 8d544645f0 Add specs and add visibility level to admin groups 2016-03-21 19:11:24 -03:00
Zeger-Jan van de Weg 6e5461c6ee Merge branch 'master' into 2489-soft-delete-issues 2016-03-21 19:32:37 +01:00
Zeger-Jan van de Weg 3b088fc5b5 Minor improvements on IssuableActions 2016-03-21 16:59:35 +01:00
Douwe Maan 19aa20d528 Fix more specs 2016-03-20 23:09:33 +01:00
Douwe Maan 7c51d5efec Fix some specs 2016-03-20 22:55:08 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Douwe Maan 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01:00
Zeger-Jan van de Weg 67043ec53b Hide delete botton on edit page 2016-03-19 21:23:03 +01:00
Zeger-Jan van de Weg 212e83bab3 Soft delete issuables 2016-03-19 21:23:03 +01:00
Grzegorz Bizon 0115ad66d2 Merge branch 'master' into feature/issue-move 
* master: (121 commits)
  Dedupe labels in labels selector in Dashboard pages
  Refactor colors and lists
  Add a safeguard in MergeRequest#compute_diverged_commits_count
  Fix an issue when the target branch of a MR had been deleted
  Add avatar to issue and MR pages header
  Cleanup somce css colors
  Re-group scss variables
  Refactor `Todo#target`
  Fixes issue with filter label missing on labels & milestones
  Rename `Todo#to_reference` to `Todo#target_reference`
  Fixed failing tests
  Updated controller with before_action Fixed other issues based on feedback
  Fixes issue on dashboard issues
  Full labels data in JSON
  Fixed issue with labels dropdown getting wrong labels
  Update CHANGELOG
  Use `Note#for_project_snippet?` to skip notes on project snippet
  Use `Commit#short_id` instead of `Commit.truncate_sha`
  Reuse `for_commit?` on conditional validations
  Update schema info comment on todo related files
  ...

Conflicts:
	app/models/issue.rb
	db/schema.rb
	spec/models/issue_spec.rb
 2016-03-19 18:50:15 +01:00
Grzegorz Bizon 9b13ce0b7a Improvements in issue move feaure (refactoring) 
According to endbosses' suggestions.
 2016-03-19 18:46:01 +01:00
Douglas Barbosa Alexandre 1e76245d4e Add commit_id to todos 2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre 42834095bc Change target_id to null on todos 2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre abb77d0f6c Add a confidential flag to issues 2016-03-17 20:55:38 -03:00
Douwe Maan 21af7459ab Merge branch '4009-external-users' into 'master' 
External Users

The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.

Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users)


![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png)

See merge request !3171
 2016-03-17 14:15:38 +00:00
Grzegorz Bizon dda7f9635f Add field that references issue this issue has been moved to 2016-03-17 10:31:17 +01:00
Felipe Artur a18ac62756 Block internal groups/projects visibility to external users 2016-03-16 21:23:59 -03:00
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03:00
Felipe Artur ec20fdf366 Code improvements and add Create group service 2016-03-16 19:44:33 -03:00
Yorick Peterse af4d5458a9 Added an index on ci_runners.token 
On PostgreSQL the index is created concurrently.

Fixes gitlab-org/gitlab-ce#14325
 2016-03-16 13:38:47 +01:00
Zeger-Jan van de Weg 59064aeeef Merge branch 'master' into 4009-external-users 2016-03-15 19:16:16 +01:00
Douwe Maan ea7d062fa6 Merge branch 'auto-gc' into 'master' 
Run 'git gc' every 10 pushes

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14250

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12620

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/254

Associated gitlab-shell MR:
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/44

See merge request !3206
 2016-03-15 10:51:38 +00:00
Zeger-Jan van de Weg 88f8d3a4d6 Merge branch 'master' into 4009-external-users 2016-03-14 20:08:02 +01:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master' 
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
 2016-03-14 16:38:52 +00:00
Jacob Vosmaer 021d53c96d Run 'git gc' every 10 pushes 2016-03-14 16:49:24 +01:00
Zeger-Jan van de Weg 42fcd3881f External Users 
The user has the rights of a public user execpt it can never create a project,
 group, or team. Also it cant view internal projects.
 2016-03-13 19:08:04 +01:00
Yorick PeterseandRobert Speicher 2080fd395c Updated schema to include Pg operator classes 
This also includes e.g. the appearances table which apparently wasn't
already included in the schema.
 2016-03-11 15:25:22 -05:00
Yorick PeterseandRobert Speicher d24ee2a206 Added trigram indexes for various searched columns 
This allows the LIKE condition to use an index. Without a GIN + trigram
index LIKE queries using a wildcard at the start _won't_ use an index
and instead perform a sequence scan.
 2016-03-11 15:25:21 -05:00
Dmitriy Zaporozhets 9a95b15552 Add share project from group lock 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-11 19:03:19 +01:00
Dmitriy Zaporozhets ea5f4cae53 Bring ProjectGroupLink model and migrations from EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-11 17:47:05 +01:00
Felipe Artur de251bcf6d Fix conflicts 2016-03-10 10:38:36 -03:00
Felipe Artur c3e70280df Prevent projects to have higher visibility than groups 
Prevent Groups to have smaller visibility than projects
Add default_group_visibility_level to configuration
Code improvements
 2016-03-10 10:38:36 -03:00
Felipe Artur 5551ccd720 Code improvements 2016-03-10 10:38:36 -03:00
Felipe Artur f2a9ee258e Add permission level to groups 2016-03-10 10:38:36 -03:00
Douglas Barbosa Alexandre 22140ced0b Remove invalid todos from database 2016-03-09 11:18:13 -03:00
Yorick Peterse c666441d40 Added main_language to the schema 
This wasn't included in gitlab-org/gitlab-ce!3000.
 2016-03-09 12:35:24 +01:00
Robert Speicher 836d593033 Remove Snippet#expires_at 
This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.
 2016-03-05 18:12:17 -05:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00