e2be17b78e
Merge branch '31458-fix-rubocop-failure' into 'master'
...
Fix a failing Rubocop rule on master
Closes #31458
See merge request !10947
2017-04-26 20:00:58 +00:00
b5526a2d13
Merge branch 'gl-version-backup-file' into 'master'
...
Add GitLab version to backup file name
See merge request !10901
2017-04-26 18:22:33 +00:00
1d0a0b9ae7
Fix a failing Rubocop rule on master
2017-04-26 14:35:34 -03:00
df85a7c004
Submodule Dockerfile templates
2017-04-26 15:57:44 +00:00
019b06b9d2
Load a project's CI status in batch from redis
2017-04-26 12:04:22 +00:00
f8f49cf516
Merge branch '26437-closed-by' into 'master'
...
Add issues/:iid/closed_by api endpoint
Closes #26437
See merge request !10511
2017-04-26 11:45:10 +00:00
d255425b8c
Merge branch 'fix/github-importer' into 'master'
...
Refactoring rake task to import GitHub repositories
See merge request !10695
2017-04-26 11:34:21 +00:00
f00bb1c29e
Merge branch 'more-mr-filters' into 'master'
...
More merge request filters
Closes #26301
See merge request !10924
2017-04-26 11:20:47 +00:00
6a541c7905
Decrease ABC threshold to 57.08
2017-04-26 10:54:11 +00:00
37c2c4a433
Decrease Cyclomatic Complexity threshold to 16
2017-04-26 10:40:28 +00:00
3ff8d8020e
Merge branch '20378-natural-sort-issue-numbers' into 'master'
...
Change issues sentence to use natural sorting
Closes #20378
See merge request !7110
2017-04-26 09:40:12 +00:00
f2da2df43a
Merge branch '31280-skip-issueables-without-project' into 'master'
...
Skip issuable without a project in IssuableExtractor#extract
Closes #31280
See merge request !10906
2017-04-26 09:27:10 +00:00
68fa16a57c
issues_for_nodes => issuables_for_nodes
2017-04-26 13:11:49 +08:00
d082b78998
Add basic progress output to GitHub import
2017-04-25 23:47:49 -03:00
f184cb433b
Fix undefined attribute params from import task
2017-04-25 23:19:30 -03:00
a78eeefd6e
Change issues sentence to use natural sorting
2017-04-25 18:57:08 -05:00
70d15ae1d9
Fix Rubocop offenses
2017-04-25 17:08:32 -03:00
2ea5d4b7af
Ability to filter merge requests by labels and milestones
2017-04-25 22:07:38 +02:00
44954c507e
Fix import of notes on Pull Request diff
2017-04-25 17:05:40 -03:00
39ab842bc2
Create project repository only when it not exists
2017-04-25 15:58:17 -03:00
000a723d84
Fix small typo on GitHub::Import
2017-04-25 15:57:50 -03:00
9f7c29baef
Follow feedback on the review
2017-04-26 02:38:59 +08:00
9852cae8d7
Merge branch 'mr-diff-size-overflow' into 'master'
...
Show correct size when MR diff overflows
Closes #26560
See merge request !10827
2017-04-25 17:45:24 +00:00
2f934ce22f
Remove the Github::Error base class
2017-04-25 13:30:30 -03:00
7df974c433
Add blank line before the raise method on Github::Collection
2017-04-25 13:30:08 -03:00
b93cc690b0
Merge branch 'dm-fix-oauth-user-creation' into 'master'
...
Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled
Closes #31294
See merge request !10896
2017-04-25 15:56:48 +00:00
a0979c05fd
Show correct size when MR diff overflows
...
The problem is that we often go via a diff object constructed from the diffs
stored in the DB. Those diffs, by definition, don't overflow, so we don't have
access to the 'correct' `real_size` - that is stored on the MR diff object
iself.
2017-04-25 16:54:10 +01:00
6dc424c949
Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master'
...
Don't display the `is_admin?` flag for user API responses
Closes #29903
See merge request !10846
2017-04-25 10:57:32 +00:00
4ded8b1cc0
Skip issuable without a project in IssuableExtractor#extract
...
Closes #31280
2017-04-25 18:39:41 +08:00
34b71e734b
Don't display the `is_admin?` flag for user API responses.
...
- To prevent an attacker from enumerating the `/users` API to get a list of all
the admins.
- Display the `is_admin?` flag wherever we display the `private_token` - at the
moment, there are two instances:
- When an admin uses `sudo` to view the `/user` endpoint
- When logging in using the `/session` endpoint
2017-04-25 09:46:05 +00:00
43f73107ca
Expose GitLab version in backup file
...
Instead of doing hacks like http://stackoverflow.com/a/26082612/974710
2017-04-25 11:36:52 +02:00
a9a1f7a61a
Merge branch 'gitaly-testing-toml' into 'master'
...
Gitaly testing toml
Closes gitaly#182
See merge request !10605
2017-04-25 08:21:06 +00:00
aeb1684c52
Fix small typo
2017-04-24 23:41:46 -03:00
dd1157c80b
Use Class.new(SuperClass) to define an empty custom error class
2017-04-24 23:41:36 -03:00
d7e2ac7293
Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled
2017-04-24 19:27:39 -07:00
30794972f4
Set timeout options to the Github::Client
2017-04-24 21:21:58 -03:00
5d106f2597
Use the base initiliazer for representations
2017-04-24 21:13:51 -03:00
05255631ae
Cache labels at the same time we fetch them from the GH API
2017-04-24 21:03:42 -03:00
22a33d8256
Avoid unnecessary use of Arel to find users by external uid
2017-04-24 20:45:51 -03:00
5c72ba0ff1
Finish the import process if some error occurs when fetching the repo
2017-04-24 20:28:06 -03:00
1f498b73da
Use only one cache hash with with a hash initializer by default
2017-04-24 20:00:11 -03:00
275f00ee88
Refactoring Github::RateLimit
2017-04-24 19:49:17 -03:00
f73a0280c9
Extract rate limit URL to a constant
2017-04-24 19:28:08 -03:00
c7935dcfae
Does not freeze integer values
2017-04-24 19:26:07 -03:00
9bdde5796a
Add Github::Representation::Base#id
2017-04-24 19:04:39 -03:00
2b7328c317
Rename find_by_email/find_by_external_uid methods
2017-04-24 18:42:50 -03:00
e50606cd2d
Refactor rake task to to import GitHub repositores
2017-04-24 16:17:52 -03:00
09a6d32817
Keep track of import errors
2017-04-24 16:17:52 -03:00
bd9e5c5ddf
Clone GitHub wiki
2017-04-24 16:17:52 -03:00
3c0a713a37
Import Github releases
2017-04-24 16:17:52 -03:00
Rémy Coutable
Douglas Barbosa Alexandre
Zeger-Jan van de Weg
Bob Van Landuyt
Sean McGivern
Maxim Rydkin
Lin Jen-Shin
Jeff Stubler
Robert Schilling
Douwe Maan
Robert Speicher
Sean McGivern
Timothy Andrew
Achilleas Pipinellis
Douwe Maan