| Commit message (Collapse) | Author | Age | Files | Lines |
| | |
|
| |
|
|
| |
Also fixed CustomIssueTrackerService title setter and added relevant specs.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/master: (368 commits)
Don't fail on an empty database
Refactor authorization_for_merge_requests.md
Support MySQL too, when removing gitorious from import_sources
Remove gitorious from import_sources on ApplicationSetting model
Add links to new docs in merge_requests.md and workflow/README.md
Move merge request versions to its own document
Move "Only allow merge requests to be merged if the build succeeds" to new location
Move revert_changes.md to new location
Move cherry_pick_changes.md to new location
Move `wip_merge_requests.md` to a new location
Move merge_when_build_succeeds.md to new location
Fix missing flash messages on service edit page
Move authorization_for_merge_requests.md to new location
Move `workflow/merge_requests.md` to `user/project/merge_requests.md`
Update README.md
Fix randomly failing specs in expand_collapse_diff_spec:
Add link on API docs index page
Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12
Remove suggested colors hover underline
Fix markdown anchor icon interaction
...
|
| | | |
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/master: (1174 commits)
Added CHANGELOG
Added unfold test to parallel and added 'diff discussion' context
Fix Spinach branches spec
Better first match on this MR also
Change merge_error column from string to text type
Fix typo in gitlab_flow.md
entities: make Environment inherit EnvironmentBasic
Updated to optimized specs from !5864
Added 'with an unfolded line should not allow commenting' scenario (line 125)
Added addtional 'renderable' validator to check 'data-note-type' attr exists
Allow passing an index to selectRowAtIndex
Fixed enter key in search input not working
Fix file links on project page Files view
Fix incorrect "stopped impersonation" log message
8.11 is released, long live 8.12
Also check if Akismet is enabled, before showing the `Submit as spam` button.
fix location of markdown help location
Fix for update 8.10-to-8.11.md doc.
Appease the linter.
Add Ruby 2.3 upgrade notes.
...
|
| | |\ |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13671791
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
# Conflicts:
# app/models/ci/pipeline.rb
# app/services/ci/create_pipeline_service.rb
# spec/models/project_services/hipchat_service_spec.rb
|
| | | | |
|
| | |/
| |
| |
| | |
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13540099
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Also add Service#event_names so that we don't have to hard code all
event names in ServiceParams. Note that I don't know why we want to
call plural on issue_event and merge_request_event so that we still
need to hard code them for issues_event and merge_requests_event.
See app/helpers/services_helper.rb for those special rules.
|
| |/ |
|
| |
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
consistent
|
| | |
|
| |\
| |
| |
| |
| |
| |
| | |
Enable Style/SpaceAfterComma and Colon Rubocop cops
See #17478
See merge request !4991
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
Rebased to resolve merge conflicts
|
| |/
|
|
|
|
| |
Requested in #14669
Added note to changelog
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If one had configured a `teamcity_url` like http://foo.bar/teamcity in
the previous implementation the plugin directed it's request i.e. to
http://foo.bar/httpAuth/... instead of http://foo.bar/teamcity/httpAuth/...
`URI.join` only works correctly, if the prefix URL has
- at least one or more trailing '/'
- the appended parts are _not_ prefixed with '/'
The current implementation should work with all sorts of TeamCity base
URLs.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
If one had configured a `bamboo_url` like http://foo.bar/bamboo in the
previous implementation the plugin directed it's request i.e. to
http://foo.bar/rest/... instead of http://foo.bar/bamboo/rest/...
`URI.join` only works correctly, if the prefix URL has
- at least one or more trailing '/'
- the appended parts are _not_ prefixed with '/'
The current implementation should work with all sorts of Bamboo base URLs.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This improves the Bamboo Service and provides a fix for situations,
where the build trigger won't work, because Bamboo is requiring
authentication also for the trigger GET.
The change now does provide additional HTTP Basic Auth parameters
if user credentials were provided and appends an request parameter
indicating the HTTP Basic Authentication should be used.
This aligns interaction with Bamboo with the other calls this service
executes.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
|
| |
|
|
| |
See #17478
|
| |
|
|
|
|
| |
Checks of literals used in conditions.
See #17478
|
| | |
|
| |
|
|
| |
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
| | |
|
| |
|
|
|
|
|
|
|
| |
In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation
has changes, which was causing a lot of noise in diffs. We decided in #17382
that it is better to get rid of the whole annotate gem, and instead let people
look at schema.rb for the columns in a table.
Fixes: #17382
|
| | |
|
| |
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
|
| |
|
|
| |
update changelog
|
| | |
|
| |
|
|
| |
Closes #13574
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Fix a bug with trailing slash in bamboo_url
Also, improve specs for BambooService
Similar to !3679.
See merge request !3680
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Also, improve specs for BambooService
Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515
Signed-off-by: Rémy Coutable <remy@rymai.me>
|