James Lopez
97c3aff16f
refactored import stuff, moved to lib
2016-04-14 17:10:57 +02:00
James Lopez
adbcccb4dd
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-04-14 16:58:52 +02:00
James Lopez
0852f539aa
refactored stuff, added a save and compress all class and moved mostly everything to lib
2016-04-14 16:57:25 +02:00
James Lopez
267fd01ce8
fixed import and spec is now passing!
2016-04-13 17:47:14 +02:00
James Lopez
36ba23d131
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-04-12 18:22:01 +02:00
James Lopez
91ffd80289
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
2016-04-12 18:18:56 +02:00
James Lopez
6f74c7d482
fix export commits stuff
2016-04-12 18:06:57 +02:00
James Lopez
0d8a97dcef
some more fixes to import projects
2016-04-12 17:10:30 +02:00
James Lopez
c94c0dc0c7
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-04-12 15:34:36 +02:00
James Lopez
3b99e4ae5b
add issue and MR comments to default export. Fix spec
2016-04-12 15:32:25 +02:00
Robert Schilling
ba21c00f01
Delete notes via API
2016-04-12 14:24:05 +02:00
James Lopez
495397793e
fix spec
2016-04-12 12:57:00 +02:00
James Lopez
eb55cb927b
more refactoring
2016-04-12 12:24:40 +02:00
James Lopez
4ffcd42780
import working!
2016-04-12 11:42:37 +02:00
James Lopez
dbf755ae56
small fix
2016-04-12 11:34:58 +02:00
James Lopez
da60baf2a5
fixing more importing issues
2016-04-12 10:36:18 +02:00
James Lopez
56fc58930c
more refactoring to use dynamic import
2016-04-11 18:30:54 +02:00
James Lopez
a28be02e88
starting to use the new dynamic stuff on the import
2016-04-08 18:13:19 +02:00
James Lopez
d29c816dfe
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-04-08 16:04:59 +02:00
James Lopez
5d642fb7aa
fix rubocop warnings
2016-04-08 15:07:12 +02:00
James Lopez
de6c44e983
using new config
2016-04-07 18:14:42 +02: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
James Lopez
acfa0b69d5
continuing to refactor config, added spec and fixed a few problems
2016-04-07 13:19:57 +02:00
Drew Blessing
935bf7271d
Only update main language if it is not already set
2016-04-06 14:56:40 -05:00
James Lopez
b4fe002264
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
2016-04-06 18:16:20 +02:00
James Lopez
efde96e9cd
started refactored the dynamic rules to be defined in a yml file
2016-04-06 18:12:41 +02: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
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
James Lopez
Robert Schilling
Rémy Coutable
Felipe Artur
Drew Blessing
Yorick Peterse
Kamil Trzcinski
Douglas Barbosa Alexandre
Douwe Maan
Baldinof
Robert Speicher
Zeger-Jan van de Weg
Grzegorz Bizon