Robert Speicher
387b025d15
Merge branch 'gh-keep-issues-prs-references' into 'master'
...
Use GitHub Issue/PR number as iid to keep references
Closes #15294
See merge request !3759
2016-04-18 19:32:23 +00:00
Douwe Maan
58665b64f5
Merge branch 'issue_3508' into 'master'
...
Restrict public users for private instances
Implements #3508
See merge request !3440
2016-04-18 15:20:13 +00:00
Douglas Barbosa Alexandre
d13bba44f0
Use GitHub Issue/PR number as iid to keep references
...
With these changes we don’t lost the issue/pr references when importing
them to GitLab.
2016-04-18 12:15:50 -03:00
Felipe Artur
09c8cf9de6
Remove group members check
2016-04-18 11:12:28 -03:00
Felipe Artur
ce96d482d9
Insert users check into api
2016-04-18 11:12:27 -03:00
Felipe Artur
07b38c3b38
Code fixes
2016-04-18 11:12:27 -03:00
Felipe Artur
147879ae66
Fix specs
2016-04-18 11:12:27 -03:00
Felipe Artur
e8a77c0aee
Fix code
2016-04-18 11:12:27 -03:00
Felipe Artur
668d6ffa43
Add specs and fix code
2016-04-18 11:12:27 -03:00
Yorick Peterse
7e6f0ac0e0
Count the number of SQL queries per transaction
...
Fixes gitlab-org/gitlab-ce#15335
2016-04-18 14:53:13 +02:00
Grzegorz Bizon
1339fda1cd
Minor refactorings in CI config
2016-04-18 13:36:52 +02:00
Grzegorz Bizon
2b1c08be8f
Validate job-level variables in YAML config file
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
cf3e3effb0
Minor refactoring in code related to job variables
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
a6260b1eb7
Remove code that removes duplicate CI variables
...
At this point this is being handled by GitLab Runner and we need to
introduce this as a separate merge request.
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
bdb06fa043
Improve build specs for job environment variables
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
1f3248644e
Make CI config return empty array if no job variables
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
3dec6e2629
Rename method that returns global envs in CI conf
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
b7946b50fc
Read job variables directly from gitlab CI config
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
b578fbfb85
Make it possible to override build variables
2016-04-18 13:17:47 +02:00
Grzegorz Bizon
a1363d39c6
Add variables keyword to job in CI config YAML
2016-04-18 13:17:47 +02:00
Yorick Peterse
651c3e841d
Instrument Repository.clean_old_archives
2016-04-18 12:33:11 +02:00
Yorick Peterse
7b6785b3b1
Use Module#prepend for method instrumentation
...
By using Module#prepend we can define a Module containing all proxy
methods. This removes the need for setting up crazy method alias chains
and in turn prevents us from having to deal with all that madness (e.g.
methods calling each other recursively).
Fixes gitlab-org/gitlab-ce#15281
2016-04-18 11:16:31 +02:00
Timothy Andrew
40bc8e7677
Add acceptance test to check if the user password persists after form redisplays.
...
- While signing up.
2016-04-18 12:19:11 +05:30
Stan Hu
e9f20f5922
Merge branch 'fix-issue-dropzone' into 'master'
...
Fixed issue with dropzone not working on new issuable
Closes #15295
See merge request !3760
2016-04-18 03:02:12 +00:00
BaldinoF
b04140a1e4
Merge branch 'master' into number_sign_for_external_issue_ref
2016-04-17 18:17:27 +02:00
Phil Hughes
0be158a072
Added upload file test to new issue form
2016-04-17 12:15:45 +01:00
Phil Hughes and Jacob Schatz
4b15a8ed26
Fixed up based on feedback
2016-04-16 16:13:16 -04:00
Phil Hughes and Jacob Schatz
ce2e37d446
Fixed tests
2016-04-16 16:13:16 -04:00
Alfredo Sumaran and Jacob Schatz
18b4291181
Add tests for autocomplete on a Commit
2016-04-16 07:21:28 -04:00
Alfredo Sumaran and Jacob Schatz
a53e912bc0
Change context description
2016-04-16 07:21:28 -04:00
Alfredo Sumaran and Jacob Schatz
40efb4eb1f
Add tests for autocomplete on a Merge Request
2016-04-16 07:21:28 -04:00
Alfredo Sumaran and Jacob Schatz
a740f0bc99
Add tests for autocomplete on a Issue
2016-04-16 07:21:28 -04:00
Robert Speicher
2e4d9c1de6
Merge branch 'fix/project-import_url' into 'master'
...
Fix for import_url fields on projects containing third-party credentials
Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2658
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13955
See merge request !3066
2016-04-15 21:52:00 +00:00
Jacob Schatz
bb59a1f98e
Merge branch 'assign-to-issuable-opener' into 'master'
...
Issuable can be assigned to author
Closes #9014
The only difference with #9014 is that I thoughed the author should also be
able to assign the issue. If this is unwanted behavior Ill revert it.
/cc @DouweM
See merge request !2765
2016-04-15 15:43:26 +00:00
Robert Schilling
3c704c33e0
Delete tags via rugged
2016-04-15 16:05:04 +02:00
Zeger-Jan van de Weg
33f8b06c39
Merge branch 'master' into assign-to-issuable-opener
2016-04-15 14:38:15 +02:00
Rémy Coutable
ddec8e777f
Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master'
...
Make /profile/keys/new redirects to /profile/keys for back-compat
This addresses https://github.com/gitlabhq/gitlabhq/issues/10138 .
See merge request !3717
2016-04-15 08:19:01 +00:00
Rémy Coutable
4e2f068c5f
Merge branch 'i_14431_award_emoji_count_not_in_comment_count' into 'master'
...
Do not include award emojis in issue view comment_count
## What does this MR do?
Fixes Issue #14431 , changing comment_count on issues index view to not include award emoji comments. While including them is technically correct, it feel nonintuitive in the way comments are presented.
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Improves UX of issues view
## What are the relevant issue numbers?
#14431
## Screenshots
### Before
- 
- 
### After
- 
- 
See merge request !3610
2016-04-15 07:58:29 +00:00
Rémy Coutable
a434ffd3b3
Make /profile/keys/new redirects to /profile/keys for back-compat
...
Report: https://github.com/gitlabhq/gitlabhq/issues/10138
Signed-off-by: Rémy Coutable <remy@rymai.me >
2016-04-15 09:45:58 +02:00
James Lopez
05985b49a4
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url
2016-04-15 08:49:08 +02:00
Douwe Maan
447a905088
Merge branch 'rs-trailing-slash-in-search' into 'master'
...
Escape the query argument provided to `git grep` by `search_files`
Closes #14963 .
See merge request !3633
2016-04-15 06:46:47 +00:00
Robert Speicher
97fd9616ac
Merge branch 'emoji_category_fix' into 'master'
...
Emoji categories fix
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14020
See merge request !3727
2016-04-14 18:22:49 +00:00
theoretick
5bf47f14b9
Do not include award emojis in issue view comment_count
...
Fixes Issue #14431
2016-04-14 11:20:55 -07:00
Valery Sizov
6ae2680ce7
Emoji categories fix
2016-04-14 20:45:55 +03:00
Robert Speicher
95a867e0af
Merge branch 'auto-fsck' into 'master'
...
Auto git fsck
Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232
See merge request !3232
2016-04-14 17:15:58 +00:00
James Lopez
e5f7a54530
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url
2016-04-14 18:12:10 +02:00
Rémy Coutable
dd9ced0af9
Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master'
...
Fix revoking of authorized OAuth applications
Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized.
Added a spec and also found that the `gon` variables were not being set for this view.
Closes #14370
See merge request !3690
2016-04-14 15:26:09 +00: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
Jacob Vosmaer
77daebe660
More create_list
2016-04-14 17:05:41 +02:00
Stan Hu
e450892f56
Include GonHelper separately and remove created_at in factory
2016-04-14 07:25:27 -07:00
Robert Speicher
Douwe Maan
Douglas Barbosa Alexandre
Felipe Artur
Yorick Peterse
Grzegorz Bizon
Timothy Andrew
Stan Hu
BaldinoF
Phil Hughes
Alfredo SumaranandJacob Schatz
Jacob Schatz
Robert Schilling
Zeger-Jan van de Weg
Rémy Coutable
James Lopez
theoretick
Valery Sizov
Jacob Vosmaer
