home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,942 Commits 48 Branches 340 Tags
6d899f46b577190eade2db9be548dcda271a9023
Commit Graph
883 Commits
Author SHA1 Message Date
Alfredo SumaranandJacob Schatz a96dc94428 Memoize target 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 1eeabdc6a5 Change variable name 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 05628e0c2f Fixes failing spec 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz ad48ecacae Update method name and remove unneeded params 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 562c9652d6 Put owner and participating people first 2016-04-16 07:21:28 -04:00
Rémy Coutable 4a514b27e9 Merge branch 'issue_15155' into 'master' 
Setup visibility level for project when transfering for a group

fixes #15155 

See merge request !3707
 2016-04-14 15:13:08 +00:00
Felipe Artur a8ea2c1895 Change transfer service to use existing methods 2016-04-14 11:34:42 -03:00
Rémy Coutable 64776ab2b4 Merge branch 'start-with-iid-on-new-branch' into 'master' 
Start with iid on branch creation

After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.

See merge request !3708
 2016-04-14 13:41:30 +00:00
Zeger-Jan van de Weg 0385cd5a58 Start with iid on branch creation 2016-04-14 14:49:45 +02:00
Rémy Coutable c71cdb194f Merge branch 'simplify-gitlab-url_builder-15202' into 'master' 
Refactor and expose only Gitlab::UrlBuilder.build(record)

```
$ git grep Gitlab::UrlBuilder

app/models/commit.rb:      url: Gitlab::UrlBuilder.build(self),
app/services/issues/base_service.rb:      issue_url = Gitlab::UrlBuilder.build(issue)
app/services/merge_requests/base_service.rb:      hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request)
app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note)
lib/gitlab/note_data_builder.rb:        base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note)
spec/lib/gitlab/note_data_builder_spec.rb:    expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note))
spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do
```

Fixes #15202.

See merge request !3696
 2016-04-14 10:27:49 +00:00
Felipe Artur 11f46b459e Setup visibility level for project when transfering for a group 2016-04-13 15:28:10 -03:00
Rémy Coutable 02cfbf0db5 Refactor and expose only Gitlab::UrlBuilder.build(record) 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-13 16:07:04 +02:00
Yorick Peterse 3b9edce803 Instrument the HousekeepingService class 
This allows us to track how much time is spent in updating the
"pushes_since_gc" column as well as the time needed to obtain the lease.
 2016-04-13 15:31:13 +02:00
Douwe Maan 4516f40dfe Merge branch 'decouple-member-notification' into 'master' 
Decouple membership and notifications

This allow you to have notification setting per project even if you are member of group. 
It also creates background for having notification settings in project you are not member of. 


- [x] Make it work
- [x] Migrations
- [x] CHANGELOG
- [x] More tests
- [x] API

For #3359 

After this merge request there is still some work to be done: 

* create migration that remove duplicates in notification settings table and create uniq index (8.8 probably)
* remove notification_level field from Member model in 9.0
* make proper API for notification settings
* use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) 
* maybe more tests 


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

See merge request !3421
 2016-04-12 16:39:40 +00:00
Robert Schilling ba21c00f01 Delete notes via API 2016-04-12 14:24:05 +02:00
Douglas Barbosa Alexandre 93a10f17e0 Reuse User#notification_settings_for when it's possible 2016-04-11 20:50:26 -03:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Rémy Coutable 074c239390 Merge branch 'issue_14012' into 'master' 
Fix problem when creating milestones in groups without projects

Fixes #14012 

See merge request !3481
 2016-04-07 15:19:56 +00:00
Felipe Artur 0bef4b9764 Implement review suggestions 2016-04-07 10:59:24 -03:00
Drew Blessing 935bf7271d Only update main language if it is not already set 2016-04-06 14:56:40 -05:00
Yorick Peterse e1bc16cbdf Merge branch 'reorder-language' into 'master' 
Update language after doing all other operations

See merge request !3533
 2016-04-05 13:46:14 +00:00
Kamil Trzcinski aad3b6ddf8 Update language only on HEAD of the repository 2016-04-05 11:08:41 +02:00
Kamil Trzcinski b8d1545bf1 Update language after doing all other operations 2016-04-05 10:54:34 +02:00
Douglas Barbosa Alexandre f2005fa566 Flush repository cache before import project data 
GitHub Pull Requests importer handle with the repository while
importing data, we need to make sure that the cached values are valid.
 2016-04-04 19:35:39 -03:00
Douwe Maan f505c753b0 Merge branch 'fix_remove_fork_link' into 'master' 
Remove fork link closes all merge requests opened on source project

Currently, if you:

- create a fork
- open a merge request on the source project
- remove the fork link

The created MR cannot be closed.

With this MR, all pending MR is closed when the fork link is removed.

See merge request !3189
 2016-04-04 15:37:08 +00:00
Baldinof a6b5b50e14 Fix incorrect variable name 2016-04-04 14:41:01 +00:00
Robert Speicher 5627542fd4 Merge branch 'routing' into 'master' 
Added & use Gitlab::Routing for URL helpers

Extracted from !3389

See merge request !3486
 2016-04-01 16:51:20 +00:00
Yorick Peterse 84b0ab7766 Added & use Gitlab::Routing for URL helpers 
Rails' "url_helpers" method creates an anonymous Module (which a bunch
of methods) on every call. By caching the output of this method in a
dedicated method we can shave off about 10 seconds of loading time for
an issue with around 200 comments.
 2016-04-01 11:13:48 +02:00
Douwe Maan 2e3c2a355f Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master' 
Fix Error 500 when searching for a comment in a project snippet

Closes #14764. /cc @stanhu, and thank you for the spec! ;)

See merge request !3468
 2016-04-01 08:38:16 +00:00
Douwe Maan 670f8540fa Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'master' 
Mentions on confidential issues doesn't create todos for non-members

Closes #14569 

See merge request !3374
 2016-04-01 08:36:20 +00:00
Douwe Maan 98df8aab7e Merge branch 'fix/issue-move-rewrite-uploads' into 'master' 
Rewrite uploads when moving issue to another project

Closes #14531

See merge request !3382
 2016-04-01 07:17:10 +00:00
Zeger-Jan van de Weg 1e7116b34d Exclude projects pending deletion from all results 2016-03-31 20:20:18 +02:00
Rémy Coutable 091b8a6ede Rename Note#for_project_snippet? to #for_snippet? 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-03-31 09:20:27 +02:00
Douglas Barbosa Alexandre 26b2810355 Mentions on confidential issues doesn't create todos for non-members 2016-03-30 18:41:21 -03:00
Dmitriy Zaporozhets 86418c475b Remove useless Notification model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 08b3d7f6ef Refactor notification helper and fix notification service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets b8f3843790 Update NotificationService to use NotificationSettings instead of membership 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-30 10:44:20 +02:00
Grzegorz Bizon e64b1e52a2 Check if GFM rewriters need rewrite internally 2016-03-30 10:44:18 +02:00
Grzegorz Bizon f2674c7b98 Refactor uploads rewriter used when moving issue 2016-03-30 10:44:18 +02:00
Grzegorz Bizon 701976e081 Add uploads rewriter and use it when moving issue 2016-03-30 10:44:18 +02:00
Grzegorz Bizon bab50e0133 Preserve time notes has been updated at when moving issue 2016-03-23 13:22:27 +01:00
Douwe Maan 3b39ce3252 Merge branch 'notifications-for-subscribers-confidential-issue-labels' into 'master' 
Restrict notifications for confidential issues

Closes #14468 

/cc @rymai 

See merge request !3334
 2016-03-23 10:34:20 +00:00
Grzegorz Bizon 915bfedfa7 Do not allow to move issue if it has not been persisted 2016-03-23 09:41:39 +01:00
Douglas Barbosa Alexandre 0a8c9f7212 Restrict notifications for confidential issues 2016-03-22 15:29:57 -03:00
Baldinof fa4126acff Move unlink fork logic to a service 2016-03-22 15:34:35 +01:00
Kamil Trzciński fc6ee35928 Merge branch 'feature-ci-only-except-trigger' into 'master' 
CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run

Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic:

- If the repository is tagged, do a build.
- Any other normal commits should not cause a build.
- If a build is triggered via the API, always create one for the specified ref.

From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration:

```yaml
only:
  - tags
  - triggers
```

I updated the tests and documentation to reflect this and everything seems to pass.

See merge request !3230
 2016-03-22 09:42:40 +00: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
Douwe Maan 45e8650c4f Fix specs 2016-03-20 23:26:58 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00