Skip to content

G
gitlab-ce
Commit 931db796 authored by Robert Schilling's avatar Robert Schilling
Browse files
Options

Merge branch 'master' into 'api-notes-entity-fields' 

# Conflicts:
#   doc/api/v3_to_v4.md
parents 0b402e11 33e4294f
Hide whitespace changes
Inline Side-by-side
Showing with 898 additions and 1121 deletions
CHANGELOG.md
View file @ 931db796
...@@ -2,6 +2,186 @@ ...@@ -2,6 +2,186 @@
documentation](doc/development/changelog.md) for instructions on adding your own documentation](doc/development/changelog.md) for instructions on adding your own
entry. entry.
## 8.17.0 (2017-02-22)
- API: Fix file downloading. !0 (8267)
- Changed composer installer script in the CI PHP example doc. !4342 (Jeffrey Cafferata)
- Display fullscreen button on small screens. !5302 (winniehell)
- Add system hook for when a project is updated (other than rename/transfer). !5711 (Tommy Beadle)
- Fix notifications when set at group level. !6813 (Alexandre Maia)
- Project labels can now be promoted to group labels. !7242 (Olaf Tomalka)
- use webpack to bundle frontend assets and use karma for frontend testing. !7288
- Adds back ability to stop all environments. !7379
- Added labels empty state. !7443
- Add ability to define a coverage regex in the .gitlab-ci.yml. !7447 (Leandro Camargo)
- Disable automatic login after clicking email confirmation links. !7472
- Search feature: redirects to commit page if query is commit sha and only commit found. !8028 (YarNayar)
- Create a TODO for user who set auto-merge when a build fails, merge conflict occurs. !8056 (twonegatives)
- Don't group issues by project on group-level and dashboard issue indexes. !8111 (Bernardo Castro)
- Mark MR as WIP when pushing WIP commits. !8124 (Jurre Stender @jurre)
- Flag multiple empty lines in eslint, fix offenses. !8137
- Add sorting pipeline for a commit. !8319 (Takuya Noguchi)
- Adds service trigger events to api. !8324
- Update pipeline and commit links when CI status is updated. !8351
- Hide version check image if there is no internet connection. !8355 (Ken Ding)
- Prevent removal of input fields if it is the parent dropdown element. !8397
- Introduce maximum session time for terminal websocket connection. !8413
- Allow creating protected branches when user can merge to such branch. !8458
- Refactor MergeRequests::BuildService. !8462 (Rydkin Maxim)
- Added GitLab Pages to CE. !8463
- Support notes when a project is not specified (personal snippet notes). !8468
- Use warning icon in mini-graph if stage passed conditionally. !8503
- Don’t count tasks that are not defined as list items correctly. !8526
- Reformat messages ChatOps. !8528
- Copy commit SHA to clipboard. !8547
- Improve button accessibility on pipelines page. !8561
- Display project ID in project settings. !8572 (winniehell)
- PlantUML support for Markdown. !8588 (Horacio Sanson)
- Fix reply by email without sub-addressing for some clients from Microsoft and Apple. !8620
- Fix nested tasks in ordered list. !8626
- Fix Sort by Recent Sign-in in Admin Area. !8637 (Poornima M)
- Avoid repeated dashes in $CI_ENVIRONMENT_SLUG. !8638
- Only show Merge Request button when user can create a MR. !8639
- Prevent copying of line numbers in parallel diff view. !8706
- Improve build policy and access abilities. !8711
- API: Remove /projects/:id/keys/.. endpoints. !8716 (Robert Schilling)
- API: Remove deprecated 'expires_at' from project snippets. !8723 (Robert Schilling)
- Add `copy` backup strategy to combat file changed errors. !8728
- adds avatar for discussion note. !8734
- Add link verification to badge partial in order to render a badge without a link. !8740
- Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms. !8752
- prevent diff unfolding link from appearing when there are no more lines to show. !8761
- Redesign searchbar in admin project list. !8776
- Rename Builds to Pipelines, CI/CD Pipelines, or Jobs everywhere. !8787
- dismiss sidebar on repo buttons click. !8798 (Adam Pahlevi)
- fixed small mini pipeline graph line glitch. !8804
- Make all system notes lowercase. !8807
- Support unauthenticated LFS object downloads for public projects. !8824 (Ben Boeckel)
- Add read-only full_path and full_name attributes to Group API. !8827
- allow relative url change without recompiling frontend assets. !8831
- Use vue.js Pipelines table in commit and merge request view. !8844
- Use reCaptcha when an issue is identified as a spam. !8846
- resolve deprecation warnings. !8855 (Adam Pahlevi)
- Cop for gem fetched from a git source. !8856 (Adam Pahlevi)
- Remove flash warning from login page. !8864 (Gerald J. Padilla)
- Adds documentation for how to use Vue.js. !8866
- Add 'View on [env]' link to blobs and individual files in diffs. !8867
- Replace word user with member. !8872
- Change the reply shortcut to focus the field even without a selection. !8873 (Brian Hall)
- Unify MR diff file button style. !8874
- Unify projects search by removing /projects/:search endpoint. !8877
- Fix disable storing of sensitive information when importing a new repo. !8885 (Bernard Pietraga)
- Fix pipeline graph vertical spacing in Firefox and Safari. !8886
- Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory. !8891
- Fix Ctrl+Click support for Todos and Merge Request page tabs. !8898
- Fix wrong call to ProjectCacheWorker.perform. !8910
- Don't perform Devise trackable updates on blocked User records. !8915
- Add ability to export project inherited group members to Import/Export. !8923
- replace `find_with_namespace` with `find_by_full_path`. !8949 (Adam Pahlevi)
- Fixes flickering of avatar border in mention dropdown. !8950
- Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index. !8956
- Fix deleting projects with pipelines and builds. !8960
- Fix broken anchor links when special characters are used. !8961 (Andrey Krivko)
- Ensure autogenerated title does not cause failing spec. !8963 (brian m. carlson)
- Update doc for enabling or disabling GitLab CI. !8965 (Takuya Noguchi)
- Remove deprecated MR and Issue endpoints and preserve V3 namespace. !8967
- Fixed "substract" typo on /help/user/project/slash_commands. !8976 (Jason Aquino)
- Preserve backward compatibility CI/CD and disallow setting `coverage` regexp in global context. !8981
- use babel to transpile all non-vendor javascript assets regardless of file extension. !8988
- Fix MR widget url. !8989
- Fixes hover cursor on pipeline pagenation. !9003
- Layer award emoji dropdown over the right sidebar. !9004
- Do not display deploy keys in user's own ssh keys list. !9024
- upgrade babel 5.8.x to babel 6.22.x. !9072
- upgrade to webpack v2.2. !9078
- Trigger autocomplete after selecting a slash command. !9117
- Add space between text and loading icon in Megre Request Widget. !9119
- Fix job to pipeline renaming. !9147
- Replace static fixture for merge_request_tabs_spec.js. !9172 (winniehell)
- Replace static fixture for right_sidebar_spec.js. !9211 (winniehell)
- Show merge errors in merge request widget. !9229
- Increase process_commit queue weight from 2 to 3. !9326 (blackst0ne)
- Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb.
- Force new password after password reset via API. (George Andrinopoulos)
- Allows to search within project by commit hash. (YarNayar)
- Show organisation membership and delete comment on smaller viewports, plus change comment author name to username.
- Remove turbolinks.
- Convert pipeline action icons to svg to have them propperly positioned.
- Remove rogue scrollbars for issue comments with inline elements.
- Align Segoe UI label text.
- Color + and - signs in diffs to increase code legibility.
- Fix tab index order on branch commits list page. (Ryan Harris)
- Add hover style to copy icon on commit page header. (Ryan Harris)
- Remove hover animation from row elements.
- Improve pipeline status icon linking in widgets.
- Fix commit title bar and repository view copy clipboard button order on last commit in repository view.
- Fix mini-pipeline stage tooltip text wrapping.
- Updated builds info link on the project settings page. (Ryan Harris)
- 27240 Make progress bars consistent.
- Only render hr when user can't archive project.
- 27352-search-label-filter-header.
- Include :author, :project, and :target in Event.with_associations.
- Don't instantiate AR objects in Event.in_projects.
- Don't capitalize environment name in show page.
- Update and pin the `jwt` gem to ~> 1.5.6.
- Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles.
- Give ci status text on pipeline graph a better font-weight.
- Add default labels to bulk assign dropdowns.
- Only return target project's comments for a commit.
- Fixes Pipelines table is not showing branch name for commit.
- Fix regression where cmd-click stopped working for todos and merge request tabs.
- Fix stray pipelines API request when showing MR.
- Fix Merge request pipelines displays JSON.
- Fix current build arrow indicator.
- Fix contribution activity alignment.
- Show Pipeline(not Job) in MR desktop notification.
- Fix tooltips in mini pipeline graph.
- Display loading indicator when filtering ref switcher dropdown.
- Show pipeline graph in MR widget if there are any stages.
- Fix icon colors in merge request widget mini graph.
- Improve blockquote formatting in notification emails.
- Adds container to tooltip in order to make it work with overflow:hidden in parent element.
- Restore pagination to admin abuse reports.
- Ensure export files are removed after a namespace is deleted.
- Add `y` keyboard shortcut to move to file permalink.
- Adds /target_branch slash command functionality for merge requests. (YarNayar)
- Patch Asciidocs rendering to block XSS.
- contribution calendar scrolls from right to left.
- Copying a rendered issue/comment will paste into GFM textareas as actual GFM.
- Don't delete assigned MRs/issues when user is deleted.
- Remove new branch button for confidential issues.
- Don't allow project guests to subscribe to merge requests through the API. (Robert Schilling)
- Don't connect in Gitlab::Database.adapter_name.
- Prevent users from creating notes on resources they can't access.
- Ignore encrypted attributes in Import/Export.
- Change rspec test to guarantee window is resized before visiting page.
- Prevent users from deleting system deploy keys via the project deploy key API.
- Fix XSS vulnerability in SVG attachments.
- Make MR-review-discussions more reliable.
- fix incorrect sidekiq concurrency count in admin background page. (wendy0402)
- Make notification_service spec DRYer by making test reusable. (YarNayar)
- Redirect http://someproject.git to http://someproject. (blackst0ne)
- Fixed group label links in issue/merge request sidebar.
- Improve gl.utils.handleLocationHash tests.
- Fixed Issuable sidebar not closing on smaller/mobile sized screens.
- Resets assignee dropdown when sidebar is open.
- Disallow system notes for closed issuables.
- Fix timezone on issue boards due date.
- Remove unused js response from refs controller.
- Prevent the GitHub importer from assigning labels and comments to merge requests or issues belonging to other projects.
- Fixed merge requests tab extra margin when fixed to window.
- Patch XSS vulnerability in RDOC support.
- Refresh authorizations when transferring projects.
- Remove issue and MR counts from labels index.
- Don't use backup Active Record connections for Sidekiq.
- Add index to ci_trigger_requests for commit_id.
- Add indices to improve loading of labels page.
- Reduced query count for snippet search.
- Update GitLab Pages to v0.3.1.
- Upgrade omniauth gem to 1.3.2.
- Remove deprecated GitlabCiService.
- Requeue pending deletion projects.
## 8.16.6 (2017-02-17) ## 8.16.6 (2017-02-17)
- API: Fix file downloading. !0 (8267) - API: Fix file downloading. !0 (8267)
......
VERSION
View file @ 931db796
8.17.0-pre 8.18.0-pre
app/assets/images/icon-merge-request-unmerged.svg 0 → 100644
View file @ 931db796
<svg width="12" height="15" viewBox="0 0 12 15" xmlns="http://www.w3.org/2000/svg"><path d="M10.267 11.028V5.167c-.028-.728-.318-1.372-.878-1.923-.56-.55-1.194-.85-1.922-.877h-.934V.5l-2.8 2.8 2.8 2.8V4.233h.934a.976.976 0 0 1 .644.29.88.88 0 0 1 .289.644v5.861a1.86 1.86 0 0 0 .933 3.472 1.86 1.86 0 0 0 .934-3.472zM3.733 3.3a1.86 1.86 0 0 0-1.866-1.867 1.86 1.86 0 0 0-.934 3.472v6.123a1.86 1.86 0 0 0 .933 3.472 1.86 1.86 0 0 0 .934-3.472V4.905c.55-.317.933-.914.933-1.605z" fill-rule="nonzero"/></svg>
app/assets/javascripts/environments/components/environment_actions.js.es6
View file @ 931db796
...@@ -15,29 +15,29 @@ module.exports = Vue.component('actions-component', { ...@@ -15,29 +15,29 @@ module.exports = Vue.component('actions-component', {
}, },
template: ` template: `
<div class="inline"> <div class="btn-group" role="group">
<div class="dropdown"> <button class="dropdown btn btn-default dropdown-new" data-toggle="dropdown">
<a class="dropdown-new btn btn-default" data-toggle="dropdown"> <span>
<span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span> <span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
<i class="fa fa-caret-down"></i> <i class="fa fa-caret-down"></i>
</a> </span>
<ul class="dropdown-menu dropdown-menu-align-right"> <ul class="dropdown-menu dropdown-menu-align-right">
<li v-for="action in actions"> <li v-for="action in actions">
<a :href="action.play_path" <a :href="action.play_path"
data-method="post" data-method="post"
rel="nofollow" rel="nofollow"
class="js-manual-action-link"> class="js-manual-action-link">
<span class="js-action-play-icon-container" v-html="playIconSvg"></span> <span class="js-action-play-icon-container" v-html="playIconSvg"></span>
<span> <span>
{{action.name}} {{action.name}}
</span> </span>
</a> </a>
</li> </li>
</ul> </ul>
</div> </button>
</div> </div>
`, `,
}); });
app/assets/javascripts/environments/components/environment_item.js.es6
View file @ 931db796
...@@ -505,39 +505,26 @@ module.exports = Vue.component('environment-item', { ...@@ -505,39 +505,26 @@ module.exports = Vue.component('environment-item', {
<td class="hidden-xs"> <td class="hidden-xs">
<div v-if="!model.isFolder"> <div v-if="!model.isFolder">
<div v-if="hasManualActions && canCreateDeployment" <div class="btn-group" role="group">
class="inline js-manual-actions-container"> <actions-component v-if="hasManualActions && canCreateDeployment"
<actions-component
:play-icon-svg="playIconSvg" :play-icon-svg="playIconSvg"
:actions="manualActions"> :actions="manualActions">
</actions-component> </actions-component>
</div>
<div v-if="externalURL && canReadEnvironment" <external-url-component v-if="externalURL && canReadEnvironment"
class="inline js-external-url-container">
<external-url-component
:external-url="externalURL"> :external-url="externalURL">
</external-url-component> </external-url-component>
</div>
<div v-if="hasStopAction && canCreateDeployment" <stop-component v-if="hasStopAction && canCreateDeployment"
class="inline js-stop-component-container">
<stop-component
:stop-url="model.stop_path"> :stop-url="model.stop_path">
</stop-component> </stop-component>
</div>
<div v-if="model && model.terminal_path" <terminal-button-component v-if="model && model.terminal_path"
class="inline js-terminal-button-container">
<terminal-button-component
:terminal-icon-svg="terminalIconSvg" :terminal-icon-svg="terminalIconSvg"
:terminal-path="model.terminal_path"> :terminal-path="model.terminal_path">
</terminal-button-component> </terminal-button-component>
</div>
<div v-if="canRetry && canCreateDeployment" <rollback-component v-if="canRetry && canCreateDeployment"
class="inline js-rollback-component-container">
<rollback-component
:is-last-deployment="isLastDeployment" :is-last-deployment="isLastDeployment"
:retry-url="retryUrl"> :retry-url="retryUrl">
</rollback-component> </rollback-component>
......
app/assets/stylesheets/pages/environments.scss
View file @ 931db796
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
display: table-cell; display: table-cell;
} }
.environments-name,
.environments-commit, .environments-commit,
.environments-actions { .environments-actions {
width: 20%; width: 20%;
...@@ -45,6 +44,7 @@ ...@@ -45,6 +44,7 @@
width: 10%; width: 10%;
} }
.environments-name,
.environments-deploy, .environments-deploy,
.environments-build { .environments-build {
width: 15%; width: 15%;
...@@ -62,6 +62,22 @@ ...@@ -62,6 +62,22 @@
} }
} }
.btn-group {
> a {
color: $gl-text-color-secondary;
}
svg path {
fill: $gl-text-color-secondary;
}
.dropdown {
outline: none;
}
}
.commit-title { .commit-title {
margin: 0; margin: 0;
} }
......
app/assets/stylesheets/pages/issues.scss
View file @ 931db796
...@@ -10,6 +10,11 @@ ...@@ -10,6 +10,11 @@
.issue-labels { .issue-labels {
display: inline-block; display: inline-block;
} }
.icon-merge-request-unmerged {
height: 13px;
margin-bottom: 3px;
}
} }
} }
......
app/controllers/concerns/issuable_collections.rb
View file @ 931db796
...@@ -9,24 +9,32 @@ module IssuableCollections ...@@ -9,24 +9,32 @@ module IssuableCollections
private private
def issuable_meta_data(issuable_collection) def issuable_meta_data(issuable_collection, collection_type)
# map has to be used here since using pluck or select will # map has to be used here since using pluck or select will
# throw an error when ordering issuables by priority which inserts # throw an error when ordering issuables by priority which inserts
# a new order into the collection. # a new order into the collection.
# We cannot use reorder to not mess up the paginated collection. # We cannot use reorder to not mess up the paginated collection.
issuable_ids = issuable_collection.map(&:id) issuable_ids = issuable_collection.map(&:id)
issuable_note_count = Note.count_for_collection(issuable_ids, @collection_type) issuable_note_count = Note.count_for_collection(issuable_ids, @collection_type)
issuable_votes_count = AwardEmoji.votes_for_collection(issuable_ids, @collection_type) issuable_votes_count = AwardEmoji.votes_for_collection(issuable_ids, @collection_type)
issuable_merge_requests_count =
if collection_type == 'Issue'
MergeRequestsClosingIssues.count_for_collection(issuable_ids)
else
[]
end
issuable_ids.each_with_object({}) do |id, issuable_meta| issuable_ids.each_with_object({}) do |id, issuable_meta|
downvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.downvote? } downvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.downvote? }
upvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.upvote? } upvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.upvote? }
notes = issuable_note_count.find { |notes| notes.noteable_id == id } notes = issuable_note_count.find { |notes| notes.noteable_id == id }
merge_requests = issuable_merge_requests_count.find { |mr| mr.first == id }
issuable_meta[id] = Issuable::IssuableMeta.new( issuable_meta[id] = Issuable::IssuableMeta.new(
upvotes.try(:count).to_i, upvotes.try(:count).to_i,
downvotes.try(:count).to_i, downvotes.try(:count).to_i,
notes.try(:count).to_i notes.try(:count).to_i,
merge_requests.try(:last).to_i
) )
end end
end end
......
app/controllers/concerns/issues_action.rb
View file @ 931db796
...@@ -10,7 +10,7 @@ module IssuesAction ...@@ -10,7 +10,7 @@ module IssuesAction
.page(params[:page]) .page(params[:page])
@collection_type = "Issue" @collection_type = "Issue"
@issuable_meta_data = issuable_meta_data(@issues) @issuable_meta_data = issuable_meta_data(@issues, @collection_type)
respond_to do |format| respond_to do |format|
format.html format.html
......
app/controllers/concerns/merge_requests_action.rb
View file @ 931db796
...@@ -9,7 +9,7 @@ module MergeRequestsAction ...@@ -9,7 +9,7 @@ module MergeRequestsAction
.page(params[:page]) .page(params[:page])
@collection_type = "MergeRequest" @collection_type = "MergeRequest"
@issuable_meta_data = issuable_meta_data(@merge_requests) @issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)
end end
private private
......
app/controllers/projects/issues_controller.rb
View file @ 931db796
...@@ -26,7 +26,7 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -26,7 +26,7 @@ class Projects::IssuesController < Projects::ApplicationController
@collection_type = "Issue" @collection_type = "Issue"
@issues = issues_collection @issues = issues_collection
@issues = @issues.page(params[:page]) @issues = @issues.page(params[:page])
@issuable_meta_data = issuable_meta_data(@issues) @issuable_meta_data = issuable_meta_data(@issues, @collection_type)
if @issues.out_of_range? && @issues.total_pages != 0 if @issues.out_of_range? && @issues.total_pages != 0
return redirect_to url_for(params.merge(page: @issues.total_pages)) return redirect_to url_for(params.merge(page: @issues.total_pages))
......
app/controllers/projects/merge_requests_controller.rb
View file @ 931db796
...@@ -39,7 +39,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -39,7 +39,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@collection_type = "MergeRequest" @collection_type = "MergeRequest"
@merge_requests = merge_requests_collection @merge_requests = merge_requests_collection
@merge_requests = @merge_requests.page(params[:page]) @merge_requests = @merge_requests.page(params[:page])
@issuable_meta_data = issuable_meta_data(@merge_requests) @issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)
if @merge_requests.out_of_range? && @merge_requests.total_pages != 0 if @merge_requests.out_of_range? && @merge_requests.total_pages != 0
return redirect_to url_for(params.merge(page: @merge_requests.total_pages)) return redirect_to url_for(params.merge(page: @merge_requests.total_pages))
......
app/helpers/emails_helper.rb
View file @ 931db796
module EmailsHelper module EmailsHelper
include AppearancesHelper
# Google Actions # Google Actions
# https://developers.google.com/gmail/markup/reference/go-to-action # https://developers.google.com/gmail/markup/reference/go-to-action
def email_action(url) def email_action(url)
...@@ -49,4 +51,19 @@ module EmailsHelper ...@@ -49,4 +51,19 @@ module EmailsHelper
msg = "This link is valid for #{password_reset_token_valid_time}. " msg = "This link is valid for #{password_reset_token_valid_time}. "
msg << "After it expires, you can #{link_tag}." msg << "After it expires, you can #{link_tag}."
end end
def header_logo
if brand_item && brand_item.header_logo?
image_tag(
brand_item.header_logo,
style: 'height: 50px'
)
else
image_tag(
image_url('mailers/gitlab_header_logo.gif'),
size: "55x50",
alt: "GitLab"
)
end
end
end end
app/mailers/emails/pipelines.rb
View file @ 931db796
...@@ -22,8 +22,8 @@ module Emails ...@@ -22,8 +22,8 @@ module Emails
mail(bcc: recipients, mail(bcc: recipients,
subject: pipeline_subject(status), subject: pipeline_subject(status),
skip_premailer: true) do |format| skip_premailer: true) do |format|
format.html { render layout: false } format.html { render layout: 'mailer' }
format.text format.text { render layout: 'mailer' }
end end
end end
......
app/models/concerns/issuable.rb
View file @ 931db796
...@@ -16,9 +16,9 @@ module Issuable ...@@ -16,9 +16,9 @@ module Issuable
include TimeTrackable include TimeTrackable
# This object is used to gather issuable meta data for displaying # This object is used to gather issuable meta data for displaying
# upvotes, downvotes and notes count for issues and merge requests # upvotes, downvotes, notes and closing merge requests count for issues and merge requests
# lists avoiding n+1 queries and improving performance. # lists avoiding n+1 queries and improving performance.
IssuableMeta = Struct.new(:upvotes, :downvotes, :notes_count) IssuableMeta = Struct.new(:upvotes, :downvotes, :notes_count, :merge_requests_count)
included do included do
cache_markdown_field :title, pipeline: :single_line cache_markdown_field :title, pipeline: :single_line
......
app/models/merge_requests_closing_issues.rb
View file @ 931db796
...@@ -4,4 +4,12 @@ class MergeRequestsClosingIssues < ActiveRecord::Base ...@@ -4,4 +4,12 @@ class MergeRequestsClosingIssues < ActiveRecord::Base
validates :merge_request_id, uniqueness: { scope: :issue_id }, presence: true validates :merge_request_id, uniqueness: { scope: :issue_id }, presence: true
validates :issue_id, presence: true validates :issue_id, presence: true
class << self
def count_for_collection(ids)
group(:issue_id).
where(issue_id: ids).
pluck('issue_id', 'COUNT(*) as count')
end
end
end end
app/views/layouts/mailer.html.haml 0 → 100644
View file @ 931db796
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
%html{ lang: "en" }
%head
%meta{ content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }/
%meta{ content: "width=device-width, initial-scale=1", name: "viewport" }/
%meta{ content: "IE=edge", "http-equiv" => "X-UA-Compatible" }/
%title= message.subject
:css
/* CLIENT-SPECIFIC STYLES */
body, table, td, a { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
table, td { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
img { -ms-interpolation-mode: bicubic; }
/* iOS BLUE LINKS */
a[x-apple-data-detectors] {
color: inherit !important;
text-decoration: none !important;
font-size: inherit !important;
font-family: inherit !important;
font-weight: inherit !important;
line-height: inherit !important;
}
/* ANDROID MARGIN HACK */
body { margin:0 !important; }
div[style*="margin: 16px 0"] { margin:0 !important; }
@media only screen and (max-width: 639px) {
body, #body {
min-width: 320px !important;
}
table.wrapper {
width: 100% !important;
min-width: 320px !important;
}
table.wrapper > tbody > tr > td {
border-left: 0 !important;
border-right: 0 !important;
border-radius: 0 !important;
padding-left: 10px !important;
padding-right: 10px !important;
}
}
%body{ style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;height:100%;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
%table#body{ border: "0", cellpadding: "0", cellspacing: "0", style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;" }
%tbody
%tr.line
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#6b4fbb;height:4px;font-size:4px;line-height:4px;" }  
%tr.header
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
= header_logo
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
%table.wrapper{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:640px;margin:0 auto;border-collapse:separate;border-spacing:0;" }
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#ffffff;text-align:left;padding:18px 25px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" }
%table.content{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:separate;border-spacing:0;" }
%tbody
= yield
%tr.footer
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
%img{ alt: "GitLab", height: "33", src: image_url('mailers/gitlab_footer_logo.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/
%div
%a{ href: profile_notifications_url, style: "color:#3777b0;text-decoration:none;" } Manage all notifications
&middot;
%a{ href: help_url, style: "color:#3777b0;text-decoration:none;" } Help
%div
You're receiving this email because of your account on
= succeed "." do
%a{ href: root_url, style: "color:#3777b0;text-decoration:none;" }= Gitlab.config.gitlab.host
app/views/layouts/mailer.text.haml 0 → 100644
View file @ 931db796
= yield
You're receiving this email because of your account on #{Gitlab.config.gitlab.host}.
Manage all notifications: #{profile_notifications_url}
Help: #{help_url}
app/views/notify/pipeline_failed_email.html.haml
View file @ 931db796
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> %tr.alert
%html{ lang: "en" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:10px;border-radius:3px;font-size:14px;line-height:1.3;text-align:center;overflow:hidden;background-color:#d22f57;color:#ffffff;" }
%head %table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;margin:0 auto;" }
%meta{ content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }/
%meta{ content: "width=device-width, initial-scale=1", name: "viewport" }/
%meta{ content: "IE=edge", "http-equiv" => "X-UA-Compatible" }/
%title= message.subject
:css
/* CLIENT-SPECIFIC STYLES */
body, table, td, a { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
table, td { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
img { -ms-interpolation-mode: bicubic; }
/* iOS BLUE LINKS */
a[x-apple-data-detectors] {
color: inherit !important;
text-decoration: none !important;
font-size: inherit !important;
font-family: inherit !important;
font-weight: inherit !important;
line-height: inherit !important;
}
/* ANDROID MARGIN HACK */
body { margin:0 !important; }
div[style*="margin: 16px 0"] { margin:0 !important; }
@media only screen and (max-width: 639px) {
body, #body {
min-width: 320px !important;
}
table.wrapper {
width: 100% !important;
min-width: 320px !important;
}
table.wrapper > tbody > tr > td {
border-left: 0 !important;
border-right: 0 !important;
border-radius: 0 !important;
padding-left: 10px !important;
padding-right: 10px !important;
}
}
%body{ style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;height:100%;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
%table#body{ border: "0", cellpadding: "0", cellspacing: "0", style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;" }
%tbody %tbody
%tr.line
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#6b4fbb;height:4px;font-size:4px;line-height:4px;" }  
%tr.header
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
%img{ alt: "GitLab", height: "50", src: image_url('mailers/ci_pipeline_notif_v1/gitlab-logo.gif'), width: "55" }/
%tr %tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;" }
%table.wrapper{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:640px;margin:0 auto;border-collapse:separate;border-spacing:0;" } %img{ alt: "x", height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-x-red-inverted.gif'), style: "display:block;", width: "13" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;" }
Your pipeline has failed.
%tr.spacer
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
&nbsp;
%tr.section
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" }
%table.info{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;" }
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;" } Project
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;" }
- namespace_name = @project.group ? @project.group.name : @project.namespace.owner.name
- namespace_url = @project.group ? group_url(@project.group) : user_url(@project.namespace.owner)
%a.muted{ href: namespace_url, style: "color:#333333;text-decoration:none;" }
= namespace_name
\/
%a.muted{ href: project_url(@project), style: "color:#333333;text-decoration:none;" }
= @project.name
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Branch
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
%img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-branch-gray.gif'), style: "display:block;", width: "13", alt: "Branch icon" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
%a.muted{ href: commits_url(@pipeline), style: "color:#333333;text-decoration:none;" }
= @pipeline.ref
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Commit
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tbody %tbody
%tr %tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#ffffff;text-align:left;padding:18px 25px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
%table.content{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:separate;border-spacing:0;" } %img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'), style: "display:block;", width: "13", alt: "Commit icon" }/
%tbody %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
%tr.alert %a{ href: commit_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:10px;border-radius:3px;font-size:14px;line-height:1.3;text-align:center;overflow:hidden;background-color:#d22f57;color:#ffffff;" } = @pipeline.short_sha
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;margin:0 auto;" } - if @merge_request
%tbody in
%tr %a{ href: merge_request_url(@merge_request), style: "color:#3777b0;text-decoration:none;" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;" } = @merge_request.to_reference
%img{ alt: "x", height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-x-red-inverted.gif'), style: "display:block;", width: "13" }/ .commit{ style: "color:#5c5c5c;font-weight:300;" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;" } = @pipeline.git_commit_message.truncate(50)
Your pipeline has failed. %tr
%tr.spacer %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Author
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
&nbsp; %table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tr.section %tbody
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" } %tr
%table.info{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;" } - commit = @pipeline.commit
%tbody %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
%tr %img.avatar{ height: "24", src: avatar_icon(commit.author || commit.author_email, 24), style: "display:block;border-radius:12px;margin:-2px 0;", width: "24", alt: "Avatar" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;" } Project %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;" } - if commit.author
- namespace_name = @project.group ? @project.group.name : @project.namespace.owner.name %a.muted{ href: user_url(commit.author), style: "color:#333333;text-decoration:none;" }
- namespace_url = @project.group ? group_url(@project.group) : user_url(@project.namespace.owner) = commit.author.name
%a.muted{ href: namespace_url, style: "color:#333333;text-decoration:none;" } - else
= namespace_name %span
\/ = commit.author_name
%a.muted{ href: project_url(@project), style: "color:#333333;text-decoration:none;" } %tr.spacer
= @project.name %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
%tr &nbsp;
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Branch - failed = @pipeline.statuses.latest.failed
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" } %tr.pre-section
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 0;" }
%tbody Pipeline
%tr %a{ href: pipeline_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" } = "\##{@pipeline.id}"
%img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-branch-gray.gif'), style: "display:block;", width: "13", alt: "Branch icon" }/ had
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" } = failed.size
%a.muted{ href: commits_url(@pipeline), style: "color:#333333;text-decoration:none;" } failed
= @pipeline.ref #{'build'.pluralize(failed.size)}.
%tr %tr.warning
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Commit %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;border:1px solid #ededed;border-bottom:0;border-radius:3px 3px 0 0;overflow:hidden;background-color:#fdf4f6;color:#d22852;font-size:14px;line-height:1.4;text-align:center;padding:8px 15px;" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" } Logs may contain sensitive data. Please consider before forwarding this email.
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" } %tr.section
%tbody %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;border-top:0;border-radius:0 0 3px 3px;" }
%tr %table.builds{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:collapse;" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" } %tbody
%img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'), style: "display:block;", width: "13", alt: "Commit icon" }/ - failed.each do |build|
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" } %tr.build-state
%a{ href: commit_url(@pipeline), style: "color:#3777b0;text-decoration:none;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;" }
= @pipeline.short_sha %table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
- if @merge_request %tbody
in %tr
%a{ href: merge_request_url(@merge_request), style: "color:#3777b0;text-decoration:none;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;padding-right:5px;" }
= @merge_request.to_reference %img{ alt: "x", height: "10", src: image_url('mailers/ci_pipeline_notif_v1/icon-x-red.gif'), style: "display:block;", width: "10" }/
.commit{ style: "color:#5c5c5c;font-weight:300;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;" }
= @pipeline.git_commit_message.truncate(50) = build.stage
%tr %td{ align: "right", style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Author = render "notify/links/#{build.to_partial_path}", pipeline: @pipeline, build: build
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" } %tr.build-log
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" } - if build.has_trace?
%tbody %td{ colspan: "2", style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;" }
%tr %pre{ style: "font-family:Monaco,'Lucida Console','Courier New',Courier,monospace;background-color:#fafafa;border-radius:3px;overflow:hidden;white-space:pre-wrap;word-break:break-all;font-size:13px;line-height:1.4;padding:12px;color:#333333;margin:0;" }
- commit = @pipeline.commit = build.trace_html(last_lines: 10).html_safe
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" } - else
%img.avatar{ height: "24", src: avatar_icon(commit.author || commit.author_email, 24), style: "display:block;border-radius:12px;margin:-2px 0;", width: "24", alt: "Avatar" }/ %td{ colspan: "2" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
- if commit.author
%a.muted{ href: user_url(commit.author), style: "color:#333333;text-decoration:none;" }
= commit.author.name
- else
%span
= commit.author_name
%tr.spacer
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
&nbsp;
- failed = @pipeline.statuses.latest.failed
%tr.pre-section
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 0;" }
Pipeline
%a{ href: pipeline_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
= "\##{@pipeline.id}"
had
= failed.size
failed
#{'build'.pluralize(failed.size)}.
%tr.warning
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;border:1px solid #ededed;border-bottom:0;border-radius:3px 3px 0 0;overflow:hidden;background-color:#fdf4f6;color:#d22852;font-size:14px;line-height:1.4;text-align:center;padding:8px 15px;" }
Logs may contain sensitive data. Please consider before forwarding this email.
%tr.section
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;border-top:0;border-radius:0 0 3px 3px;" }
%table.builds{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:collapse;" }
%tbody
- failed.each do |build|
%tr.build-state
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;" }
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;padding-right:5px;" }
%img{ alt: "x", height: "10", src: image_url('mailers/ci_pipeline_notif_v1/icon-x-red.gif'), style: "display:block;", width: "10" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;" }
= build.stage
%td{ align: "right", style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;" }
= render "notify/links/#{build.to_partial_path}", pipeline: @pipeline, build: build
%tr.build-log
- if build.has_trace?
%td{ colspan: "2", style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;" }
%pre{ style: "font-family:Monaco,'Lucida Console','Courier New',Courier,monospace;background-color:#fafafa;border-radius:3px;overflow:hidden;white-space:pre-wrap;word-break:break-all;font-size:13px;line-height:1.4;padding:12px;color:#333333;margin:0;" }
= build.trace_html(last_lines: 10).html_safe
- else
%td{ colspan: "2" }
%tr.footer
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
%img{ alt: "GitLab", height: "33", src: image_url('mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/
%div
%a{ href: profile_notifications_url, style: "color:#3777b0;text-decoration:none;" } Manage all notifications
&middot;
%a{ href: help_url, style: "color:#3777b0;text-decoration:none;" } Help
%div
You're receiving this email because of your account on
= succeed "." do
%a{ href: root_url, style: "color:#3777b0;text-decoration:none;" }= Gitlab.config.gitlab.host
app/views/notify/pipeline_failed_email.text.erb
View file @ 931db796
...@@ -27,7 +27,3 @@ Trace: <%= build.trace_with_state(last_lines: 10)[:text] %> ...@@ -27,7 +27,3 @@ Trace: <%= build.trace_with_state(last_lines: 10)[:text] %>
<% end -%> <% end -%>
<% end -%> <% end -%>
You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>.
Manage all notifications: <%= profile_notifications_url %>
Help: <%= help_url %>
app/views/notify/pipeline_success_email.html.haml
View file @ 931db796
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> %tr.success
%html{ lang: "en" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:10px;border-radius:3px;font-size:14px;line-height:1.3;text-align:center;overflow:hidden;color:#ffffff;background-color:#31af64;" }
%head %table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;margin:0 auto;" }
%meta{ content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }/
%meta{ content: "width=device-width, initial-scale=1", name: "viewport" }/
%meta{ content: "IE=edge", "http-equiv" => "X-UA-Compatible" }/
%title= message.subject
:css
/* CLIENT-SPECIFIC STYLES */
body, table, td, a { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
table, td { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
img { -ms-interpolation-mode: bicubic; }
/* iOS BLUE LINKS */
a[x-apple-data-detectors] {
color: inherit !important;
text-decoration: none !important;
font-size: inherit !important;
font-family: inherit !important;
font-weight: inherit !important;
line-height: inherit !important;
}
/* ANDROID MARGIN HACK */
body { margin:0 !important; }
div[style*="margin: 16px 0"] { margin:0 !important; }
@media only screen and (max-width: 639px) {
body, #body {
min-width: 320px !important;
}
table.wrapper {
width: 100% !important;
min-width: 320px !important;
}
table.wrapper > tbody > tr > td {
border-left: 0 !important;
border-right: 0 !important;
border-radius: 0 !important;
padding-left: 10px !important;
padding-right: 10px !important;
}
}
%body{ style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;height:100%;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
%table#body{ border: "0", cellpadding: "0", cellspacing: "0", style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;" }
%tbody %tbody
%tr.line
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#6b4fbb;height:4px;font-size:4px;line-height:4px;" }  
%tr.header
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
%img{ alt: "GitLab", height: "50", src: image_url('mailers/ci_pipeline_notif_v1/gitlab-logo.gif'), width: "55" }/
%tr %tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;" }
%table.wrapper{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:640px;margin:0 auto;border-collapse:separate;border-spacing:0;" } %img{ alt: "✓", height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif'), style: "display:block;", width: "13" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;" }
Your pipeline has passed.
%tr.spacer
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
&nbsp;
%tr.section
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" }
%table.info{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;" }
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;" } Project
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;" }
- namespace_name = @project.group ? @project.group.name : @project.namespace.owner.name
- namespace_url = @project.group ? group_url(@project.group) : user_url(@project.namespace.owner)
%a.muted{ href: namespace_url, style: "color:#333333;text-decoration:none;" }
= namespace_name
\/
%a.muted{ href: project_url(@project), style: "color:#333333;text-decoration:none;" }
= @project.name
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Branch
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
%img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-branch-gray.gif'), style: "display:block;", width: "13", alt: "Branch icon" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
%a.muted{ href: commits_url(@pipeline), style: "color:#333333;text-decoration:none;" }
= @pipeline.ref
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Commit
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
%img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'), style: "display:block;", width: "13", alt: "Commit icon" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
%a{ href: commit_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
= @pipeline.short_sha
- if @merge_request
in
%a{ href: merge_request_url(@merge_request), style: "color:#3777b0;text-decoration:none;" }
= @merge_request.to_reference
.commit{ style: "color:#5c5c5c;font-weight:300;" }
= @pipeline.git_commit_message.truncate(50)
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Author
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tbody %tbody
%tr %tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#ffffff;text-align:left;padding:18px 25px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" } - commit = @pipeline.commit
%table.content{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:separate;border-spacing:0;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
%tbody %img.avatar{ height: "24", src: avatar_icon(commit.author || commit.author_email, 24), style: "display:block;border-radius:12px;margin:-2px 0;", width: "24", alt: "Avatar" }/
%tr.success %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:10px;border-radius:3px;font-size:14px;line-height:1.3;text-align:center;overflow:hidden;color:#ffffff;background-color:#31af64;" } - if commit.author
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;margin:0 auto;" } %a.muted{ href: user_url(commit.author), style: "color:#333333;text-decoration:none;" }
%tbody = commit.author.name
%tr - else
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;" } %span
%img{ alt: "✓", height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif'), style: "display:block;", width: "13" }/ = commit.author_name
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;" } %tr.spacer
Your pipeline has passed. %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
%tr.spacer &nbsp;
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" } %tr.success-message
&nbsp; %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 5px;text-align:center;" }
%tr.section - build_count = @pipeline.statuses.latest.size
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" } - stage_count = @pipeline.stages_count
%table.info{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;" } Pipeline
%tbody %a{ href: pipeline_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
%tr = "\##{@pipeline.id}"
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;" } Project successfully completed
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;" } #{build_count} #{'build'.pluralize(build_count)}
- namespace_name = @project.group ? @project.group.name : @project.namespace.owner.name in
- namespace_url = @project.group ? group_url(@project.group) : user_url(@project.namespace.owner) #{stage_count} #{'stage'.pluralize(stage_count)}.
%a.muted{ href: namespace_url, style: "color:#333333;text-decoration:none;" }
= namespace_name
\/
%a.muted{ href: project_url(@project), style: "color:#333333;text-decoration:none;" }
= @project.name
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Branch
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
%img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-branch-gray.gif'), style: "display:block;", width: "13", alt: "Branch icon" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
%a.muted{ href: commits_url(@pipeline), style: "color:#333333;text-decoration:none;" }
= @pipeline.ref
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Commit
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
%img{ height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-commit-gray.gif'), style: "display:block;", width: "13", alt: "Commit icon" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
%a{ href: commit_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
= @pipeline.short_sha
- if @merge_request
in
%a{ href: merge_request_url(@merge_request), style: "color:#3777b0;text-decoration:none;" }
= @merge_request.to_reference
.commit{ style: "color:#5c5c5c;font-weight:300;" }
= @pipeline.git_commit_message.truncate(50)
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;" } Author
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
%table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;" }
%tbody
%tr
- commit = @pipeline.commit
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;" }
%img.avatar{ height: "24", src: avatar_icon(commit.author || commit.author_email, 24), style: "display:block;border-radius:12px;margin:-2px 0;", width: "24", alt: "Avatar" }/
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;" }
- if commit.author
%a.muted{ href: user_url(commit.author), style: "color:#333333;text-decoration:none;" }
= commit.author.name
- else
%span
= commit.author_name
%tr.spacer
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
&nbsp;
%tr.success-message
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 5px;text-align:center;" }
- build_count = @pipeline.statuses.latest.size
- stage_count = @pipeline.stages_count
Pipeline
%a{ href: pipeline_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
= "\##{@pipeline.id}"
successfully completed
#{build_count} #{'build'.pluralize(build_count)}
in
#{stage_count} #{'stage'.pluralize(stage_count)}.
%tr.footer
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
%img{ alt: "GitLab", height: "33", src: image_url('mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/
%div
%a{ href: profile_notifications_url, style: "color:#3777b0;text-decoration:none;" } Manage all notifications
&middot;
%a{ href: help_url, style: "color:#3777b0;text-decoration:none;" } Help
%div
You're receiving this email because of your account on
= succeed "." do
%a{ href: root_url, style: "color:#3777b0;text-decoration:none;" }= Gitlab.config.gitlab.host
app/views/notify/pipeline_success_email.text.erb
View file @ 931db796
...@@ -18,7 +18,3 @@ Commit Author: <%= commit.author_name %> ...@@ -18,7 +18,3 @@ Commit Author: <%= commit.author_name %>
<% build_count = @pipeline.statuses.latest.size -%> <% build_count = @pipeline.statuses.latest.size -%>
<% stage_count = @pipeline.stages_count -%> <% stage_count = @pipeline.stages_count -%>
Pipeline #<%= @pipeline.id %> ( <%= pipeline_url(@pipeline) %> ) successfully completed <%= build_count %> <%= 'build'.pluralize(build_count) %> in <%= stage_count %> <%= 'stage'.pluralize(stage_count) %>. Pipeline #<%= @pipeline.id %> ( <%= pipeline_url(@pipeline) %> ) successfully completed <%= build_count %> <%= 'build'.pluralize(build_count) %> in <%= stage_count %> <%= 'stage'.pluralize(stage_count) %>.
You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>.
Manage all notifications: <%= profile_notifications_url %>
Help: <%= help_url %>
app/views/projects/pipelines_settings/_badge.html.haml
View file @ 931db796
...@@ -25,3 +25,10 @@ ...@@ -25,3 +25,10 @@
HTML HTML
.col-md-10.code.js-syntax-highlight .col-md-10.code.js-syntax-highlight
= highlight('.html', badge.to_html) = highlight('.html', badge.to_html)
.row
%hr
.row
.col-md-2.text-center
AsciiDoc
.col-md-10.code.js-syntax-highlight
= highlight('.adoc', badge.to_asciidoc)
app/views/projects/variables/_form.html.haml
View file @ 931db796
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
= f.text_field :key, class: "form-control", placeholder: "PROJECT_VARIABLE", required: true = f.text_field :key, class: "form-control", placeholder: "PROJECT_VARIABLE", required: true
.form-group .form-group
= f.label :value, "Value", class: "label-light" = f.label :value, "Value", class: "label-light"
= f.text_area :value, class: "form-control", placeholder: "PROJECT_VARIABLE", required: true = f.text_area :value, class: "form-control", placeholder: "PROJECT_VARIABLE"
= f.submit btn_text, class: "btn btn-save" = f.submit btn_text, class: "btn btn-save"
app/views/shared/_issuable_meta_data.html.haml
View file @ 931db796
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
- issue_votes = @issuable_meta_data[issuable.id] - issue_votes = @issuable_meta_data[issuable.id]
- upvotes, downvotes = issue_votes.upvotes, issue_votes.downvotes - upvotes, downvotes = issue_votes.upvotes, issue_votes.downvotes
- issuable_url = @collection_type == "Issue" ? issue_path(issuable, anchor: 'notes') : merge_request_path(issuable, anchor: 'notes') - issuable_url = @collection_type == "Issue" ? issue_path(issuable, anchor: 'notes') : merge_request_path(issuable, anchor: 'notes')
- issuable_mr = @issuable_meta_data[issuable.id].merge_requests_count
- if issuable_mr > 0
%li
= image_tag('icon-merge-request-unmerged', class: 'icon-merge-request-unmerged')
= issuable_mr
- if upvotes > 0 - if upvotes > 0
%li %li
......
changelogs/unreleased/17662-rename-builds.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Rename Builds to Pipelines, CI/CD Pipelines, or Jobs everywhere
merge_request: 8787
author:
changelogs/unreleased/20452-remove-require-from-request_profiler-initializer.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb
merge_request:
author:
changelogs/unreleased/21518_recaptcha_spam_issues.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Use reCaptcha when an issue is identified as a spam
merge_request: 8846
author:
changelogs/unreleased/22007-unify-projects-search.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Unify projects search by removing /projects/:search endpoint
merge_request: 8877
author:
changelogs/unreleased/22638-creating-a-branch-matching-a-wildcard-fails.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Allow creating protected branches when user can merge to such branch
merge_request: 8458
author:
changelogs/unreleased/22974-trigger-service-events-through-api.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Adds service trigger events to api
merge_request: 8324
author:
changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Create a TODO for user who set auto-merge when a build fails, merge conflict occurs
merge_request: 8056
author: twonegatives
changelogs/unreleased/23634-remove-project-grouping.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Don't group issues by project on group-level and dashboard issue indexes.
merge_request: 8111
author: Bernardo Castro
changelogs/unreleased/23767-disable-storing-of-sensitive-information.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix disable storing of sensitive information when importing a new repo
merge_request: 8885
author: Bernard Pietraga
changelogs/unreleased/24147-delete-env-button.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Adds back ability to stop all environments
merge_request: 7379
author:
changelogs/unreleased/24606-force-password-reset-on-next-login.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Force new password after password reset via API
merge_request:
author: George Andrinopoulos
changelogs/unreleased/24716-fix-ctrl-click-links.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix Ctrl+Click support for Todos and Merge Request page tabs
merge_request: 8898
author:
changelogs/unreleased/24795_refactor_merge_request_build_service.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Refactor MergeRequests::BuildService
merge_request: 8462
author: Rydkin Maxim
changelogs/unreleased/24833-Allow-to-search-by-commit-hash-within-project.yml deleted 100644 → 0
View file @ 0b402e11
---
title: 'Allows to search within project by commit hash'
merge_request:
author: YarNayar
changelogs/unreleased/24923_nested_tasks.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix nested tasks in ordered list
merge_request: 8626
author:
changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Show organisation membership and delete comment on smaller viewports, plus change comment author name to username
merge_request:
author:
changelogs/unreleased/25312-search-input-cmd-click-issue.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Prevent removal of input fields if it is the parent dropdown element
merge_request: 8397
author:
changelogs/unreleased/25360-remove-flash-warning-from-login-page.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Remove flash warning from login page
merge_request: 8864
author: Gerald J. Padilla
changelogs/unreleased/25460-replace-word-users-with-members.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Replace word user with member
merge_request: 8872
author:
changelogs/unreleased/25624-anticipate-obstacles-to-removing-turbolinks.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Remove turbolinks.
merge_request: !8570
author:
changelogs/unreleased/25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggered.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Update pipeline and commit links when CI status is updated
merge_request: 8351
author:
changelogs/unreleased/25910-convert-manual-action-icons-to-svg-to-propperly-position-them.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Convert pipeline action icons to svg to have them propperly positioned
merge_request:
author:
changelogs/unreleased/25989-fix-rogue-scrollbars-on-comments.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Remove rogue scrollbars for issue comments with inline elements
merge_request:
author:
changelogs/unreleased/26059-segoe-ui-vertical.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Align Segoe UI label text
merge_request:
author:
changelogs/unreleased/26068_tasklist_issue.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Don’t count tasks that are not defined as list items correctly
merge_request: 8526
author:
changelogs/unreleased/26087-asciidoc-cicd-badges-snippet.yml 0 → 100644
View file @ 931db796
---
title: Added AsciiDoc Snippet to CI/CD Badges
merge_request: 9164
author: Jan Christophersen
changelogs/unreleased/26117-sort-pipeline-for-commit.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add sorting pipeline for a commit
merge_request: 8319
author: Takuya Noguchi
changelogs/unreleased/26186-diff-view-plus-and-minus-signs-as-part-of-line-number.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Color + and - signs in diffs to increase code legibility
merge_request:
author:
changelogs/unreleased/26445-accessible-piplelines-buttons.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Improve button accessibility on pipelines page
merge_request: 8561
author:
changelogs/unreleased/26447-fix-tab-list-order.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix tab index order on branch commits list page
merge_request:
author: Ryan Harris
changelogs/unreleased/26468-fix-users-sort-in-admin-area.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix Sort by Recent Sign-in in Admin Area
merge_request: 8637
author: Poornima M
changelogs/unreleased/26787-add-copy-icon-hover-state.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add hover style to copy icon on commit page header
merge_request:
author: Ryan Harris
changelogs/unreleased/26824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfold.yml deleted 100644 → 0
View file @ 0b402e11
---
title: prevent diff unfolding link from appearing when there are no more lines to
show
merge_request: 8761
author:
changelogs/unreleased/26852-fix-slug-for-openshift.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Avoid repeated dashes in $CI_ENVIRONMENT_SLUG
merge_request: 8638
author:
changelogs/unreleased/26863-Remove-hover-animation-from-row-elements.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Remove hover animation from row elements
merge_request:
author:
changelogs/unreleased/26881-backup-fails-if-data-changes.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add `copy` backup strategy to combat file changed errors
merge_request: 8728
author:
changelogs/unreleased/26920-hover-cursor-on-pagination-element.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fixes hover cursor on pipeline pagenation
merge_request: 9003
author:
changelogs/unreleased/26947-build-status-self-link.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add link verification to badge partial in order to render a badge without a link
merge_request: 8740
author:
changelogs/unreleased/26982-improve-pipeline-status-icon-linking-in-widgets.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Improve pipeline status icon linking in widgets
merge_request:
author:
changelogs/unreleased/27013-regression-in-commit-title-bar.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix commit title bar and repository view copy clipboard button order on last commit in repository view
merge_request:
author:
changelogs/unreleased/27014-fix-pipeline-tooltip-wrapping.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix mini-pipeline stage tooltip text wrapping
merge_request:
author:
changelogs/unreleased/27021-line-numbers-now-in-copy-pasta-data.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Prevent copying of line numbers in parallel diff view
merge_request: 8706
author:
changelogs/unreleased/27032-add-a-house-keeping-api-call.yml 0 → 100644
View file @ 931db796
---
title: Add housekeeping endpoint for Projects API
merge_request: 9421
author:
changelogs/unreleased/27178-update-builds-link-in-project-settings.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Updated builds info link on the project settings page
merge_request:
author: Ryan Harris
changelogs/unreleased/27277-small-mini-pipeline-graph-glitch-upon-hover.yml deleted 100644 → 0
View file @ 0b402e11
---
title: fixed small mini pipeline graph line glitch
merge_request: 8804
author:
changelogs/unreleased/27291-unify-mr-diff-file-buttons.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Unify MR diff file button style
merge_request: 8874
author:
changelogs/unreleased/27321-double-separator-line-in-edit-projects-settings.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Only render hr when user can't archive project.
merge_request: !8917
author:
changelogs/unreleased/27332-mini-pipeline-graph-with-many-stages-has-no-line-spacing-in-firefox-and-safari.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix pipeline graph vertical spacing in Firefox and Safari
merge_request: 8886
author:
changelogs/unreleased/27352-search-label-filter-header.yml deleted 100644 → 0
View file @ 0b402e11
---
title: 27352-search-label-filter-header
merge_request:
author:
changelogs/unreleased/27395-reduce-group-activity-sql-queries-2.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Include :author, :project, and :target in Event.with_associations
merge_request:
author:
changelogs/unreleased/27395-reduce-group-activity-sql-queries.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Don't instantiate AR objects in Event.in_projects
merge_request:
author:
changelogs/unreleased/27484-environment-show-name.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Don't capitalize environment name in show page
merge_request:
author:
changelogs/unreleased/27488-fix-jwt-version.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Update and pin the `jwt` gem to ~> 1.5.6
merge_request:
author:
changelogs/unreleased/27494-environment-list-column-headers.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles
merge_request:
author:
changelogs/unreleased/27602-fix-avatar-border-flicker-mention-dropdown.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fixes flickering of avatar border in mention dropdown
merge_request: 8950
author:
changelogs/unreleased/27632_fix_mr_widget_url.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix MR widget url
merge_request: 8989
author:
changelogs/unreleased/27639-emoji-panel-under-the-side-panel-in-the-merge-request.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Layer award emoji dropdown over the right sidebar
merge_request: 9004
author:
changelogs/unreleased/27656-doc-ci-enable-ci.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Update doc for enabling or disabling GitLab CI
merge_request: 8965
author: Takuya Noguchi
changelogs/unreleased/27774-text-color-contrast-is-barely-readable-for-pipelines-visualization-graph-page-with-roboto-fonts.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Give ci status text on pipeline graph a better font-weight
merge_request:
author:
changelogs/unreleased/27822-default-bulk-assign-labels.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add default labels to bulk assign dropdowns
merge_request:
author:
changelogs/unreleased/27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Only return target project's comments for a commit
merge_request:
author:
changelogs/unreleased/27880-pipelines-table-not-showing-commit-branch.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fixes Pipelines table is not showing branch name for commit
merge_request:
author:
changelogs/unreleased/27883-autocomplete-seems-to-not-trigger-when-at-character-is-part-of-an-autocompleted-text.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Trigger autocomplete after selecting a slash command
merge_request: 9117
author:
changelogs/unreleased/27922-cmd-click-todo-doesn-t-work.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix regression where cmd-click stopped working for todos and merge request
tabs
merge_request:
author:
changelogs/unreleased/27925-fix-mr-stray-pipelines-api-request.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix stray pipelines API request when showing MR
merge_request:
author:
changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix Merge request pipelines displays JSON
merge_request:
author:
changelogs/unreleased/27939-fix-current-build-arrow.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix current build arrow indicator
merge_request:
author:
changelogs/unreleased/27943-contribution-list-on-profile-page-is-aligned-right.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix contribution activity alignment
merge_request:
author:
changelogs/unreleased/27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add space between text and loading icon in Megre Request Widget
merge_request: 9119
author:
changelogs/unreleased/27955-mr-notification-use-pipeline-language.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Show Pipeline(not Job) in MR desktop notification
merge_request:
author:
changelogs/unreleased/27963-tooltips-jobs.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix tooltips in mini pipeline graph
merge_request:
author:
changelogs/unreleased/27966-branch-ref-switcher-input-filter-broken.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Display loading indicator when filtering ref switcher dropdown
merge_request:
author:
changelogs/unreleased/27987-skipped-pipeline-mr-graph.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Show pipeline graph in MR widget if there are any stages
merge_request:
author:
changelogs/unreleased/27991-success-with-warnings-caret.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix icon colors in merge request widget mini graph
merge_request:
author:
changelogs/unreleased/28029-improve-blockquote-formatting-on-emails.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Improve blockquote formatting in notification emails
merge_request:
author:
changelogs/unreleased/28032-tooltips-file-name.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Adds container to tooltip in order to make it work with overflow:hidden in
parent element
merge_request:
author:
changelogs/unreleased/28059-add-pagination-to-admin-abuse-reports.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Restore pagination to admin abuse reports
merge_request:
author:
changelogs/unreleased/28458-present-gitlab-version-for-v4-changes-on-docs.yml 0 → 100644
View file @ 931db796
---
title: Present GitLab version for each V3 to V4 API change on v3_to_v4.md
merge_request:
author:
changelogs/unreleased/28524-gitlab-ci-yml-coverage-key-is-unknown.yml 0 → 100644
View file @ 931db796
---
title: Document when current coverage configuration option was introduced
merge_request: 9443
author:
changelogs/unreleased/395-fix-notification-when-group-set-to-watch.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix notifications when set at group level
merge_request: 6813
author: Alexandre Maia
changelogs/unreleased/8-15-stable.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Ensure export files are removed after a namespace is deleted
merge_request:
author:
changelogs/unreleased/8082-permalink-to-file.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add `y` keyboard shortcut to move to file permalink
merge_request:
author:
changelogs/unreleased/9-0-api-changes.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Remove deprecated MR and Issue endpoints and preserve V3 namespace
merge_request: 8967
author:
changelogs/unreleased/Add-a-shash-command-for-target-merge-request-branch.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Adds /target_branch slash command functionality for merge requests
merge_request:
author: YarNayar
changelogs/unreleased/add_mr_info_to_issues_list.yml 0 → 100644
View file @ 931db796
---
title: Add merge request count to each issue on issues list
merge_request: 9252
author: blackst0ne
changelogs/unreleased/add_project_update_hook.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add system hook for when a project is updated (other than rename/transfer)
merge_request: 5711
author: Tommy Beadle
changelogs/unreleased/api-remove-snippets-expires-at.yml deleted 100644 → 0
View file @ 0b402e11
---
title: 'API: Remove deprecated ''expires_at'' from project snippets'
merge_request: 8723
author: Robert Schilling
changelogs/unreleased/babel-all-the-things.yml deleted 100644 → 0
View file @ 0b402e11
---
title: use babel to transpile all non-vendor javascript assets regardless of file
extension
merge_request: 8988
author:
changelogs/unreleased/broken_iamge_when_doing_offline_update_check-help_page-.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Hide version check image if there is no internet connection
merge_request: 8355
author: Ken Ding
changelogs/unreleased/change_queue_weight.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Increase process_commit queue weight from 2 to 3
merge_request: 9326
author: blackst0ne
changelogs/unreleased/clipboard-button-commit-sha.yml deleted 100644 → 0
View file @ 0b402e11
---
title: 'Copy commit SHA to clipboard'
merge_request: 8547
changelogs/unreleased/contribution-calendar-scroll.yml deleted 100644 → 0
View file @ 0b402e11
---
title: contribution calendar scrolls from right to left
merge_request:
author:
changelogs/unreleased/cop-gem-fetcher.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Cop for gem fetched from a git source
merge_request: 8856
author: Adam Pahlevi
changelogs/unreleased/copy-as-md.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Copying a rendered issue/comment will paste into GFM textareas as actual GFM
merge_request:
author:
changelogs/unreleased/disable-autologin-on-email-confirmation-links.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Disable automatic login after clicking email confirmation links
merge_request: 7472
author:
changelogs/unreleased/display-project-id.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Display project ID in project settings
merge_request: 8572
author: winniehell
changelogs/unreleased/document-how-to-vue.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Adds documentation for how to use Vue.js
merge_request: 8866
author:
changelogs/unreleased/dynamic-todos-fixture.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Replace static fixture for right_sidebar_spec.js
merge_request: 9211
author: winniehell
changelogs/unreleased/dz-nested-groups-improvements-2.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add read-only full_path and full_name attributes to Group API
merge_request: 8827
author:
changelogs/unreleased/empty-selection-reply-shortcut.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Change the reply shortcut to focus the field even without a selection.
merge_request: 8873
author: Brian Hall
changelogs/unreleased/fe-commit-mr-pipelines.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Use vue.js Pipelines table in commit and merge request view
merge_request: 8844
author:
changelogs/unreleased/feature-brand-logo-in-emails.yml 0 → 100644
View file @ 931db796
---
title: Brand header logo for pipeline emails
merge_request: 9049
author: Alexis Reigel
changelogs/unreleased/feature-success-warning-icons-in-stages-builds.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Use warning icon in mini-graph if stage passed conditionally
merge_request: 8503
author:
changelogs/unreleased/fix-27479.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Remove new branch button for confidential issues
merge_request:
author:
changelogs/unreleased/fix-api-mr-permissions.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Don't allow project guests to subscribe to merge requests through the API
merge_request:
author: Robert Schilling
changelogs/unreleased/fix-ar-connection-leaks.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Don't connect in Gitlab::Database.adapter_name
merge_request:
author:
changelogs/unreleased/fix-ci-build-policy.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Improve build policy and access abilities
merge_request: 8711
author:
changelogs/unreleased/fix-deleting-project-again.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix deleting projects with pipelines and builds
merge_request: 8960
author:
changelogs/unreleased/fix-depr-warn.yml deleted 100644 → 0
View file @ 0b402e11
---
title: resolve deprecation warnings
merge_request: 8855
author: Adam Pahlevi
changelogs/unreleased/fix-gb-backwards-compatibility-coverage-ci-yml.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Preserve backward compatibility CI/CD and disallow setting `coverage` regexp in global context
merge_request: 8981
author:
changelogs/unreleased/fix-guest-access-posting-to-notes.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Prevent users from creating notes on resources they can't access
merge_request:
author:
changelogs/unreleased/fix-import-encrypt-atts.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Ignore encrypted attributes in Import/Export
merge_request:
author:
changelogs/unreleased/fix-import-group-members.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add ability to export project inherited group members to Import/Export
merge_request: 8923
author:
changelogs/unreleased/fix-job-to-pipeline-renaming.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix job to pipeline renaming
merge_request: 9147
author:
changelogs/unreleased/fix-references-header-parsing.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix reply by email without sub-addressing for some clients from
Microsoft and Apple
merge_request: 8620
author:
changelogs/unreleased/fix-scroll-test.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Change rspec test to guarantee window is resized before visiting page
merge_request:
author:
changelogs/unreleased/fix-users-deleting-public-deployment-keys.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Prevent users from deleting system deploy keys via the project deploy key API
merge_request:
author:
changelogs/unreleased/fix_broken_diff_discussions.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Make MR-review-discussions more reliable
merge_request:
author:
changelogs/unreleased/fix_sidekiq_concurrency_warning_message_in_admin_background_job_page.yml deleted 100644 → 0
View file @ 0b402e11
---
title: fix incorrect sidekiq concurrency count in admin background page
merge_request:
author: wendy0402
changelogs/unreleased/fwn-to-find-by-full-path.yml deleted 100644 → 0
View file @ 0b402e11
---
title: replace `find_with_namespace` with `find_by_full_path`
merge_request: 8949
author: Adam Pahlevi
changelogs/unreleased/get-rid-of-water-from-notification_service_spec-to-make-it-DRY.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Make notification_service spec DRYer by making test reusable
merge_request:
author: YarNayar
changelogs/unreleased/git_to_html_redirection.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Redirect http://someproject.git to http://someproject
merge_request:
author: blackst0ne
changelogs/unreleased/go-go-gadget-webpack.yml deleted 100644 → 0
View file @ 0b402e11
---
title: use webpack to bundle frontend assets and use karma for frontend testing
merge_request: 7288
author:
changelogs/unreleased/group-label-sidebar-link.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fixed group label links in issue/merge request sidebar
merge_request:
author:
changelogs/unreleased/hardcode-title-system-note.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Ensure autogenerated title does not cause failing spec
merge_request: 8963
author: brian m. carlson
changelogs/unreleased/improve-ci-example-php-doc.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Changed composer installer script in the CI PHP example doc
merge_request: 4342
author: Jeffrey Cafferata
changelogs/unreleased/improve-handleLocationHash-tests.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Improve gl.utils.handleLocationHash tests
merge_request:
author:
changelogs/unreleased/issuable-sidebar-bug.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fixed Issuable sidebar not closing on smaller/mobile sized screens
merge_request:
author:
changelogs/unreleased/issue-20428.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add ability to define a coverage regex in the .gitlab-ci.yml
merge_request: 7447
author: Leandro Camargo
changelogs/unreleased/issue-sidebar-empty-assignee.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Resets assignee dropdown when sidebar is open
merge_request:
author:
changelogs/unreleased/issue_19262.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Disallow system notes for closed issuables
merge_request:
author:
changelogs/unreleased/issue_23317.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fix timezone on issue boards due date
merge_request:
author:
changelogs/unreleased/issue_27211.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Remove unused js response from refs controller
merge_request:
author:
changelogs/unreleased/jej-pages-picked-from-ee.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Added GitLab Pages to CE
merge_request: 8463
author:
changelogs/unreleased/label-promotion.yml deleted 100644 → 0
View file @ 0b402e11
---
title: "Project labels can now be promoted to group labels"
merge_request: 7242
author: Olaf Tomalka
changelogs/unreleased/lfs-noauth-public-repo.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Support unauthenticated LFS object downloads for public projects
merge_request: 8824
author: Ben Boeckel
changelogs/unreleased/lnovy-gitlab-ce-empty-variables.yml 0 → 100644
View file @ 931db796
---
title: 'UI: Allow a project variable to be set to an empty value'
merge_request: 6044
author: Lukáš Nový
changelogs/unreleased/markdown-plantuml.yml deleted 100644 → 0
View file @ 0b402e11
---
title: PlantUML support for Markdown
merge_request: 8588
author: Horacio Sanson
changelogs/unreleased/merge-request-tabs-fixture.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Replace static fixture for merge_request_tabs_spec.js
merge_request: 9172
author: winniehell
changelogs/unreleased/misalinged-discussion-with-no-avatar-26854.yml deleted 100644 → 0
View file @ 0b402e11
---
title: adds avatar for discussion note
merge_request: 8734
author:
changelogs/unreleased/mr-tabs-container-offset.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fixed merge requests tab extra margin when fixed to window
merge_request:
author:
changelogs/unreleased/newline-eslint-rule.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Flag multiple empty lines in eslint, fix offenses.
merge_request: 8137
author:
changelogs/unreleased/no-sidebar-on-action-btn-click.yml deleted 100644 → 0
View file @ 0b402e11
---
title: dismiss sidebar on repo buttons click
merge_request: 8798
author: Adam Pahlevi
changelogs/unreleased/no_project_notes.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Support notes when a project is not specified (personal snippet notes)
merge_request: 8468
author:
changelogs/unreleased/pms-lowercase-system-notes.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Make all system notes lowercase
merge_request: 8807
author:
changelogs/unreleased/redesign-searchbar-admin-project-26794.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Redesign searchbar in admin project list
merge_request: 8776
author:
changelogs/unreleased/redirect-to-commit-when-only-commit-found.yml deleted 100644 → 0
View file @ 0b402e11
---
title: 'Search feature: redirects to commit page if query is commit sha and only commit
found'
merge_request: 8028
author: YarNayar
changelogs/unreleased/relative-url-assets.yml deleted 100644 → 0
View file @ 0b402e11
---
title: allow relative url change without recompiling frontend assets
merge_request: 8831
author:
changelogs/unreleased/remove-deploy-key-endpoint.yml deleted 100644 → 0
View file @ 0b402e11
---
title: 'API: Remove /projects/:id/keys/.. endpoints'
merge_request: 8716
author: Robert Schilling
changelogs/unreleased/remove-issue-and-mr-counts-from-labels-page.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Remove issue and MR counts from labels index
merge_request:
author:
changelogs/unreleased/route-map.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add 'View on [env]' link to blobs and individual files in diffs
merge_request: 8867
author:
changelogs/unreleased/rs-warden-blocked-users.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Don't perform Devise trackable updates on blocked User records
merge_request: 8915
author:
changelogs/unreleased/sh-add-index-to-ci-trigger-requests.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add index to ci_trigger_requests for commit_id
merge_request:
author:
changelogs/unreleased/sh-add-labels-index.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Add indices to improve loading of labels page
merge_request:
author:
changelogs/unreleased/slash-commands-typo.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Fixed "substract" typo on /help/user/project/slash_commands
merge_request: 8976
author: Jason Aquino
changelogs/unreleased/small-screen-fullscreen-button.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Display fullscreen button on small screens
merge_request: 5302
author: winniehell
changelogs/unreleased/snippets-search-performance.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Reduced query count for snippet search
merge_request:
author:
changelogs/unreleased/tc-only-mr-button-if-allowed.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Only show Merge Request button when user can create a MR
merge_request: 8639
author:
changelogs/unreleased/terminal-max-session-time.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Introduce maximum session time for terminal websocket connection
merge_request: 8413
author:
changelogs/unreleased/updated-pages-0-3-1.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Update GitLab Pages to v0.3.1
merge_request:
author:
changelogs/unreleased/upgrade-babel-v6.yml deleted 100644 → 0
View file @ 0b402e11
---
title: upgrade babel 5.8.x to babel 6.22.x
merge_request: 9072
author:
changelogs/unreleased/upgrade-omniauth.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Upgrade omniauth gem to 1.3.2
merge_request:
author:
changelogs/unreleased/upgrade-webpack-v2-2.yml deleted 100644 → 0
View file @ 0b402e11
---
title: upgrade to webpack v2.2
merge_request: 9078
author:
changelogs/unreleased/wip-mr-from-commits.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Mark MR as WIP when pushing WIP commits
merge_request: 8124
author: Jurre Stender @jurre
changelogs/unreleased/27240-make-progress-bars-consistent.yml → changelogs/unreleased/zj-fix-slash-command-labels.yml
View file @ 931db796
--- ---
title: 27240 Make progress bars consistent title: Chat slash commands show labels correctly
merge_request: merge_request:
author: author:
changelogs/unreleased/zj-format-chat-messages.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Reformat messages ChatOps
merge_request: 8528
author:
changelogs/unreleased/zj-remove-deprecated-ci-service.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Remove deprecated GitlabCiService
merge_request:
author:
changelogs/unreleased/zj-requeue-pending-delete.yml deleted 100644 → 0
View file @ 0b402e11
---
title: Requeue pending deletion projects
merge_request:
author:
doc/README.md
View file @ 931db796
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
- [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed. - [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed.
- [Update](update/README.md) Update guides to upgrade your installation. - [Update](update/README.md) Update guides to upgrade your installation.
- [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page. - [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page.
- [Header logo](customization/branded_page_and_email_header.md) Change the logo on the overall page and email header.
- [Reply by email](administration/reply_by_email.md) Allow users to comment on issues and merge requests by replying to notification emails. - [Reply by email](administration/reply_by_email.md) Allow users to comment on issues and merge requests by replying to notification emails.
- [Migrate GitLab CI to CE/EE](migrate_ci_to_ce/README.md) Follow this guide to migrate your existing GitLab CI data to GitLab CE/EE. - [Migrate GitLab CI to CE/EE](migrate_ci_to_ce/README.md) Follow this guide to migrate your existing GitLab CI data to GitLab CE/EE.
- [Git LFS configuration](workflow/lfs/lfs_administration.md) - [Git LFS configuration](workflow/lfs/lfs_administration.md)
......
doc/api/projects.md
View file @ 931db796
...@@ -1193,3 +1193,17 @@ Parameters: ...@@ -1193,3 +1193,17 @@ Parameters:
| `query` | string | yes | A string contained in the project name | | `query` | string | yes | A string contained in the project name |
| `order_by` | string | no | Return requests ordered by `id`, `name`, `created_at` or `last_activity_at` fields | | `order_by` | string | no | Return requests ordered by `id`, `name`, `created_at` or `last_activity_at` fields |
| `sort` | string | no | Return requests sorted in `asc` or `desc` order | | `sort` | string | no | Return requests sorted in `asc` or `desc` order |
## Start the Housekeeping task for a Project
>**Note:** This feature was introduced in GitLab 9.0
```
POST /projects/:id/housekeeping
```
Parameters:
| Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- |
| `id` | integer/string | yes | The ID of the project or NAMESPACE/PROJECT_NAME |
doc/api/v3_to_v4.md
View file @ 931db796
...@@ -4,17 +4,20 @@ Our V4 API version is currently available as *Beta*! It means that V3 ...@@ -4,17 +4,20 @@ Our V4 API version is currently available as *Beta*! It means that V3
will still be supported and remain unchanged for now, but be aware that the following will still be supported and remain unchanged for now, but be aware that the following
changes are in V4: changes are in V4:
### Changes ### 8.17
- Removed `/projects/:search` (use: `/projects?search=x`) - Removed `/projects/:search` (use: `/projects?search=x`) [!8877](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8877)
- `iid` filter has been removed from `projects/:id/issues` - `iid` filter has been removed from `projects/:id/issues` [!8967](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8967)
- `projects/:id/merge_requests?iid[]=x&iid[]=y` array filter has been renamed to `iids` - `projects/:id/merge_requests?iid[]=x&iid[]=y` array filter has been renamed to `iids` [!8793](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8793)
- Endpoints under `projects/merge_request/:id` have been removed (use: `projects/merge_requests/:id`) - Endpoints under `projects/merge_request/:id` have been removed (use: `projects/merge_requests/:id`) [!8793](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8793)
- Project snippets do not return deprecated field `expires_at` - Project snippets do not return deprecated field `expires_at` [!8723](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8723)
- Endpoints under `projects/:id/keys` have been removed (use `projects/:id/deploy_keys`) - Endpoints under `projects/:id/keys` have been removed (use `projects/:id/deploy_keys`) [!8716](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8716)
- Status 409 returned for POST `project/:id/members` when a member already exists
- Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` ### 9.0
- Removed the following deprecated Templates endpoints (these are still accessible with `/templates` prefix)
- Status 409 returned for POST `project/:id/members` when a member already exists [!9093](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9093)
- Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` [!9328](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9328)
- Removed the following deprecated Templates endpoints (these are still accessible with `/templates` prefix) [!8853](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8853)
- `/licences` - `/licences`
- `/licences/:key` - `/licences/:key`
- `/gitignores` - `/gitignores`
...@@ -23,17 +26,18 @@ changes are in V4: ...@@ -23,17 +26,18 @@ changes are in V4:
- `/gitignores/:key` - `/gitignores/:key`
- `/gitlab_ci_ymls/:key` - `/gitlab_ci_ymls/:key`
- `/dockerfiles/:key` - `/dockerfiles/:key`
- Moved `/projects/fork/:id` to `/projects/:id/fork` - Moved `/projects/fork/:id` to `/projects/:id/fork` [!8940](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8940)
- Moved `DELETE /todos` to `POST /todos/mark_as_done` and `DELETE /todos/:todo_id` to `POST /todos/:todo_id/mark_as_done` - Moved `DELETE /todos` to `POST /todos/mark_as_done` and `DELETE /todos/:todo_id` to `POST /todos/:todo_id/mark_as_done` [!9410](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9410)
- Endpoints `/projects/owned`, `/projects/visible`, `/projects/starred` & `/projects/all` are consolidated into `/projects` using query parameters - Endpoints `/projects/owned`, `/projects/visible`, `/projects/starred` & `/projects/all` are consolidated into `/projects` using query parameters [!8962](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8962)
- Return pagination headers for all endpoints that return an array - Return pagination headers for all endpoints that return an array [!8606](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8606)
- Removed `DELETE projects/:id/deploy_keys/:key_id/disable`. Use `DELETE projects/:id/deploy_keys/:key_id` instead - Removed `DELETE projects/:id/deploy_keys/:key_id/disable`. Use `DELETE projects/:id/deploy_keys/:key_id` instead [!9366](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9366)
- Moved `PUT /users/:id/(block|unblock)` to `POST /users/:id/(block|unblock)` - Moved `PUT /users/:id/(block|unblock)` to `POST /users/:id/(block|unblock)` [!9371](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9371)
- Make subscription API more RESTful. Use `post ":project_id/:subscribable_type/:subscribable_id/subscribe"` to subscribe and `post ":project_id/:subscribable_type/:subscribable_id/unsubscribe"` to unsubscribe from a resource. - Make subscription API more RESTful. Use `post ":project_id/:subscribable_type/:subscribable_id/subscribe"` to subscribe and `post ":project_id/:subscribable_type/:subscribable_id/unsubscribe"` to unsubscribe from a resource. [!9325](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9325)
- Labels filter on `projects/:id/issues` and `/issues` now matches only issues containing all labels (i.e.: Logical AND, not OR) - Labels filter on `projects/:id/issues` and `/issues` now matches only issues containing all labels (i.e.: Logical AND, not OR) [!8849](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8849)
- Renamed param `branch_name` to `branch` on the following endpoints - Renamed param `branch_name` to `branch` on the following endpoints [!8936](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8936)
- POST `:id/repository/branches` - POST `:id/repository/branches`
- POST `:id/repository/commits` - POST `:id/repository/commits`
- POST/PUT/DELETE `:id/repository/files` - POST/PUT/DELETE `:id/repository/files`
- Renamed `branch_name` to `branch` on DELETE `id/repository/branches/:branch` response - Renamed `branch_name` to `branch` on DELETE `id/repository/branches/:branch` response [!8936](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8936)
- Remove `public` param from create and edit actions of projects [!8736](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8736)
- Notes do not return deprecated field `upvote` and `downvote` [!9384](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9384) - Notes do not return deprecated field `upvote` and `downvote` [!9384](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9384)
doc/ci/docker/using_docker_build.md
View file @ 931db796
...@@ -308,6 +308,30 @@ push to the Registry connected to your project. Its password is provided in the ...@@ -308,6 +308,30 @@ push to the Registry connected to your project. Its password is provided in the
`$CI_BUILD_TOKEN` variable. This allows you to automate building and deployment `$CI_BUILD_TOKEN` variable. This allows you to automate building and deployment
of your Docker images. of your Docker images.
You can also make use of [other variables](../variables/README.md) to avoid hardcoding:
```yaml
services:
- docker:dind
variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
before_script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
build:
stage: build
script:
- docker build -t $IMAGE_TAG .
- docker push $IMAGE_TAG
```
Here, `$CI_REGISTRY_IMAGE` would be resolved to the address of the registry tied
to this project, and `$CI_BUILD_REF_NAME` would be resolved to the branch or
tag name for this particular job. We also declare our own variable, `$IMAGE_TAG`,
combining the two to save us some typing in the `script` section.
Here's a more elaborate example that splits up the tasks into 4 pipeline stages, Here's a more elaborate example that splits up the tasks into 4 pipeline stages,
including two tests that run in parallel. The `build` is stored in the container including two tests that run in parallel. The `build` is stored in the container
registry and used by subsequent stages, downloading the image registry and used by subsequent stages, downloading the image
......
doc/ci/yaml/README.md
View file @ 931db796
...@@ -1003,6 +1003,9 @@ job: ...@@ -1003,6 +1003,9 @@ job:
### coverage ### coverage
**Notes:**
- [Introduced][ce-7447] in GitLab 8.17.
`coverage` allows you to configure how code coverage will be extracted from the `coverage` allows you to configure how code coverage will be extracted from the
job output. job output.
...@@ -1361,3 +1364,4 @@ CI with various languages. ...@@ -1361,3 +1364,4 @@ CI with various languages.
[ce-6669]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6669 [ce-6669]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6669
[variables]: ../variables/README.md [variables]: ../variables/README.md
[ce-7983]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7983 [ce-7983]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7983
[ce-7447]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7447
doc/customization/branded_page_and_email_header.md 0 → 100644
View file @ 931db796
# Changing the logo on the overall page and email header
Navigate to the **Admin** area and go to the **Appearance** page.
Upload the custom logo (**Header logo**) in the section **Navigation bar**.
![appearance](branded_page_and_email_header/appearance.png)
After saving the page, your GitLab navigation bar will contain the custom logo:
![custom_brand_header](branded_page_and_email_header/custom_brand_header.png)
The GitLab pipeline emails will also have the custom logo:
![custom_email_header](branded_page_and_email_header/custom_email_header.png)
doc/user/profile/account/two_factor_authentication.md
View file @ 931db796
...@@ -213,5 +213,5 @@ your GitLab server's time is synchronized via a service like NTP. Otherwise, ...@@ -213,5 +213,5 @@ your GitLab server's time is synchronized via a service like NTP. Otherwise,
you may have cases where authorization always fails because of time differences. you may have cases where authorization always fails because of time differences.
[Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en [Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en
[FreeOTP]: https://fedorahosted.org/freeotp/ [FreeOTP]: https://freeotp.github.io/
[YubiKey]: https://www.yubico.com/products/yubikey-hardware/ [YubiKey]: https://www.yubico.com/products/yubikey-hardware/
lib/api/projects.rb
View file @ 931db796
...@@ -374,6 +374,19 @@ module API ...@@ -374,6 +374,19 @@ module API
present paginate(users), with: Entities::UserBasic present paginate(users), with: Entities::UserBasic
end end
desc 'Start the housekeeping task for a project' do
detail 'This feature was introduced in GitLab 9.0.'
end
post ':id/housekeeping' do
authorize_admin_project
begin
::Projects::HousekeepingService.new(user_project).execute
rescue ::Projects::HousekeepingService::LeaseTaken => error
conflict!(error.message)
end
end
end end
end end
end end
lib/ci/api/runners.rb
View file @ 931db796
module Ci module Ci
module API module API
# Runners API
class Runners < Grape::API class Runners < Grape::API
resource :runners do resource :runners do
# Delete runner desc 'Delete a runner'
# Parameters: params do
# token (required) - The unique token of runner requires :token, type: String, desc: 'The unique token of the runner'
# end
# Example Request:
# GET /runners/delete
delete "delete" do delete "delete" do
required_attributes! [:token]
authenticate_runner! authenticate_runner!
Ci::Runner.find_by_token(params[:token]).destroy Ci::Runner.find_by_token(params[:token]).destroy
end end
# Register a new runner desc 'Register a new runner' do
# success Entities::Runner
# Note: This is an "internal" API called when setting up end
# runners, so it is authenticated differently. params do
# requires :token, type: String, desc: 'The unique token of the runner'
# Parameters: optional :description, type: String, desc: 'The description of the runner'
# token (required) - The unique token of runner optional :tag_list, type: Array[String], desc: 'A list of tags the runner should run for'
# optional :run_untagged, type: Boolean, desc: 'Flag if the runner should execute untagged jobs'
# Example Request: optional :locked, type: Boolean, desc: 'Lock this runner for this specific project'
# POST /runners/register end
post "register" do post "register" do
required_attributes! [:token] runner_params = declared(params, include_missing: false)
attributes = attributes_for_keys(
[:description, :tag_list, :run_untagged, :locked]
)
runner = runner =
if runner_registration_token_valid? if runner_registration_token_valid?
# Create shared runner. Requires admin access # Create shared runner. Requires admin access
Ci::Runner.create(attributes.merge(is_shared: true)) Ci::Runner.create(runner_params.merge(is_shared: true))
elsif project = Project.find_by(runners_token: params[:token]) elsif project = Project.find_by(runners_token: runner_params[:token])
# Create a specific runner for project. # Create a specific runner for project.
project.runners.create(attributes) project.runners.create(runner_params)
end end
return forbidden! unless runner return forbidden! unless runner
......
lib/ci/api/triggers.rb
View file @ 931db796
module Ci module Ci
module API module API
# Build Trigger API
class Triggers < Grape::API class Triggers < Grape::API
resource :projects do resource :projects do
# Trigger a GitLab CI project build desc 'Trigger a GitLab CI project build' do
# success Entities::TriggerRequest
# Parameters: end
# id (required) - The ID of a CI project params do
# ref (required) - The name of project's branch or tag requires :id, type: Integer, desc: 'The ID of a CI project'
# token (required) - The uniq token of trigger requires :ref, type: String, desc: "The name of project's branch or tag"
# Example Request: requires :token, type: String, desc: 'The unique token of the trigger'
# POST /projects/:id/ref/:ref/trigger optional :variables, type: Hash, desc: 'Optional build variables'
end
post ":id/refs/:ref/trigger" do post ":id/refs/:ref/trigger" do
required_attributes! [:token] project = Project.find_by(ci_id: params[:id])
trigger = Ci::Trigger.find_by_token(params[:token])
project = Project.find_by(ci_id: params[:id].to_i)
trigger = Ci::Trigger.find_by_token(params[:token].to_s)
not_found! unless project && trigger not_found! unless project && trigger
unauthorized! unless trigger.project == project unauthorized! unless trigger.project == project
# validate variables # Validate variables
variables = params[:variables] variables = params[:variables].to_h
if variables unless variables.all? { |key, value| key.is_a?(String) && value.is_a?(String) }
unless variables.is_a?(Hash) render_api_error!('variables needs to be a map of key-valued strings', 400)
render_api_error!('variables needs to be a hash', 400)
end
unless variables.all? { |key, value| key.is_a?(String) && value.is_a?(String) }
render_api_error!('variables needs to be a map of key-valued strings', 400)
end
# convert variables from Mash to Hash
variables = variables.to_h
end end
# create request and trigger builds # create request and trigger builds
trigger_request = Ci::CreateTriggerRequestService.new.execute(project, trigger, params[:ref].to_s, variables) trigger_request = Ci::CreateTriggerRequestService.new.execute(project, trigger, params[:ref], variables)
if trigger_request if trigger_request
present trigger_request, with: Entities::TriggerRequest present trigger_request, with: Entities::TriggerRequest
else else
......
lib/gitlab/badge/metadata.rb
View file @ 931db796
...@@ -20,6 +20,10 @@ module Gitlab ...@@ -20,6 +20,10 @@ module Gitlab
"[![#{title}](#{image_url})](#{link_url})" "[![#{title}](#{image_url})](#{link_url})"
end end
def to_asciidoc
"image:#{image_url}[link=\"#{link_url}\",title=\"#{title}\"]"
end
def title def title
raise NotImplementedError raise NotImplementedError
end end
......
lib/gitlab/chat_commands/presenters/issue_base.rb
View file @ 931db796
...@@ -32,7 +32,7 @@ module Gitlab ...@@ -32,7 +32,7 @@ module Gitlab
}, },
{ {
title: "Labels", title: "Labels",
value: @resource.labels.any? ? @resource.label_names : "_None_", value: @resource.labels.any? ? @resource.label_names.join(', ') : "_None_",
short: true short: true
} }
] ]
......
lib/gitlab/database.rb
View file @ 931db796
...@@ -79,11 +79,16 @@ module Gitlab ...@@ -79,11 +79,16 @@ module Gitlab
end end
end end
def self.create_connection_pool(pool_size) # pool_size - The size of the DB pool.
# host - An optional host name to use instead of the default one.
def self.create_connection_pool(pool_size, host = nil)
# See activerecord-4.2.7.1/lib/active_record/connection_adapters/connection_specification.rb # See activerecord-4.2.7.1/lib/active_record/connection_adapters/connection_specification.rb
env = Rails.env env = Rails.env
original_config = ActiveRecord::Base.configurations original_config = ActiveRecord::Base.configurations
env_config = original_config[env].merge('pool' => pool_size) env_config = original_config[env].merge('pool' => pool_size)
env_config['host'] = host if host
config = original_config.merge(env => env_config) config = original_config.merge(env => env_config)
spec = spec =
......
spec/features/issuables/issuable_list_spec.rb
View file @ 931db796
...@@ -30,6 +30,13 @@ describe 'issuable list', feature: true do ...@@ -30,6 +30,13 @@ describe 'issuable list', feature: true do
end end
end end
it "counts merge requests closing issues icons for each issue" do
visit_issuable_list(:issue)
expect(page).to have_selector('.icon-merge-request-unmerged', count: 1)
expect(first('.icon-merge-request-unmerged').find(:xpath, '..')).to have_content(1)
end
def visit_issuable_list(issuable_type) def visit_issuable_list(issuable_type)
if issuable_type == :issue if issuable_type == :issue
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
...@@ -53,5 +60,15 @@ describe 'issuable list', feature: true do ...@@ -53,5 +60,15 @@ describe 'issuable list', feature: true do
create(:award_emoji, :downvote, awardable: issuable) create(:award_emoji, :downvote, awardable: issuable)
create(:award_emoji, :upvote, awardable: issuable) create(:award_emoji, :upvote, awardable: issuable)
end end
if issuable_type == :issue
issue = Issue.reorder(:iid).first
merge_request = create(:merge_request,
title: FFaker::Lorem.sentence,
source_project: project,
source_branch: FFaker::Name.name)
MergeRequestsClosingIssues.create!(issue: issue, merge_request: merge_request)
end
end end
end end
spec/features/projects/badges/list_spec.rb
View file @ 931db796
...@@ -14,7 +14,8 @@ feature 'list of badges' do ...@@ -14,7 +14,8 @@ feature 'list of badges' do
expect(page).to have_content 'build status' expect(page).to have_content 'build status'
expect(page).to have_content 'Markdown' expect(page).to have_content 'Markdown'
expect(page).to have_content 'HTML' expect(page).to have_content 'HTML'
expect(page).to have_css('.highlight', count: 2) expect(page).to have_content 'AsciiDoc'
expect(page).to have_css('.highlight', count: 3)
expect(page).to have_xpath("//img[@alt='build status']") expect(page).to have_xpath("//img[@alt='build status']")
page.within('.highlight', match: :first) do page.within('.highlight', match: :first) do
...@@ -28,7 +29,8 @@ feature 'list of badges' do ...@@ -28,7 +29,8 @@ feature 'list of badges' do
expect(page).to have_content 'coverage report' expect(page).to have_content 'coverage report'
expect(page).to have_content 'Markdown' expect(page).to have_content 'Markdown'
expect(page).to have_content 'HTML' expect(page).to have_content 'HTML'
expect(page).to have_css('.highlight', count: 2) expect(page).to have_content 'AsciiDoc'
expect(page).to have_css('.highlight', count: 3)
expect(page).to have_xpath("//img[@alt='coverage report']") expect(page).to have_xpath("//img[@alt='coverage report']")
page.within('.highlight', match: :first) do page.within('.highlight', match: :first) do
......
spec/features/variables_spec.rb
View file @ 931db796
...@@ -3,7 +3,7 @@ require 'spec_helper' ...@@ -3,7 +3,7 @@ require 'spec_helper'
describe 'Project variables', js: true do describe 'Project variables', js: true do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:project) { create(:project) } let(:project) { create(:project) }
let(:variable) { create(:ci_variable, key: 'test') } let(:variable) { create(:ci_variable, key: 'test_key', value: 'test value') }
before do before do
login_as(user) login_as(user)
...@@ -24,11 +24,23 @@ describe 'Project variables', js: true do ...@@ -24,11 +24,23 @@ describe 'Project variables', js: true do
fill_in('variable_value', with: 'key value') fill_in('variable_value', with: 'key value')
click_button('Add new variable') click_button('Add new variable')
expect(page).to have_content('Variables were successfully updated.')
page.within('.variables-table') do page.within('.variables-table') do
expect(page).to have_content('key') expect(page).to have_content('key')
end end
end end
it 'adds empty variable' do
fill_in('variable_key', with: 'new_key')
fill_in('variable_value', with: '')
click_button('Add new variable')
expect(page).to have_content('Variables were successfully updated.')
page.within('.variables-table') do
expect(page).to have_content('new_key')
end
end
it 'reveals and hides new variable' do it 'reveals and hides new variable' do
fill_in('variable_key', with: 'key') fill_in('variable_key', with: 'key')
fill_in('variable_value', with: 'key value') fill_in('variable_value', with: 'key value')
...@@ -72,8 +84,20 @@ describe 'Project variables', js: true do ...@@ -72,8 +84,20 @@ describe 'Project variables', js: true do
fill_in('variable_value', with: 'key value') fill_in('variable_value', with: 'key value')
click_button('Save variable') click_button('Save variable')
expect(page).to have_content('Variable was successfully updated.')
expect(project.variables.first.value).to eq('key value')
end
it 'edits variable with empty value' do
page.within('.variables-table') do page.within('.variables-table') do
expect(page).to have_content('key') find('.btn-variable-edit').click
end end
expect(page).to have_content('Update variable')
fill_in('variable_value', with: '')
click_button('Save variable')
expect(page).to have_content('Variable was successfully updated.')
expect(project.variables.first.value).to eq('')
end end
end end
spec/helpers/emails_helper_spec.rb
View file @ 931db796
...@@ -43,4 +43,36 @@ describe EmailsHelper do ...@@ -43,4 +43,36 @@ describe EmailsHelper do
end end
end end
end end
describe '#header_logo' do
context 'there is a brand item with a logo' do
it 'returns the brand header logo' do
appearance = create :appearance, header_logo: fixture_file_upload(
Rails.root.join('spec/fixtures/dk.png')
)
expect(header_logo).to eq(
%{<img style="height: 50px" src="/uploads/appearance/header_logo/#{appearance.id}/dk.png" alt="Dk" />}
)
end
end
context 'there is a brand item without a logo' do
it 'returns the default header logo' do
create :appearance, header_logo: nil
expect(header_logo).to eq(
%{<img alt="GitLab" src="/images/mailers/gitlab_header_logo.gif" width="55" height="50" />}
)
end
end
context 'there is no brand item' do
it 'returns the default header logo' do
expect(header_logo).to eq(
%{<img alt="GitLab" src="/images/mailers/gitlab_header_logo.gif" width="55" height="50" />}
)
end
end
end
end end
spec/lib/gitlab/badge/shared/metadata.rb
View file @ 931db796
...@@ -18,4 +18,14 @@ shared_examples 'badge metadata' do ...@@ -18,4 +18,14 @@ shared_examples 'badge metadata' do
it { is_expected.to include metadata.image_url } it { is_expected.to include metadata.image_url }
it { is_expected.to include metadata.link_url } it { is_expected.to include metadata.link_url }
end end
describe '#to_asciidoc' do
subject { metadata.to_asciidoc }
it { is_expected.to include metadata.image_url }
it { is_expected.to include metadata.link_url }
it { is_expected.to include 'image:' }
it { is_expected.to include 'link=' }
it { is_expected.to include 'title=' }
end
end end
spec/lib/gitlab/chat_commands/presenters/issue_show_spec.rb
View file @ 931db796
...@@ -26,6 +26,21 @@ describe Gitlab::ChatCommands::Presenters::IssueShow do ...@@ -26,6 +26,21 @@ describe Gitlab::ChatCommands::Presenters::IssueShow do
end end
end end
context 'with labels' do
let(:label) { create(:label, project: project, title: 'mep') }
let(:label1) { create(:label, project: project, title: 'mop') }
before do
issue.labels << [label, label1]
end
it 'shows the labels' do
labels = attachment[:fields].find { |f| f[:title] == 'Labels' }
expect(labels[:value]).to eq("mep, mop")
end
end
context 'confidential issue' do context 'confidential issue' do
let(:issue) { create(:issue, project: project) } let(:issue) { create(:issue, project: project) }
......
spec/lib/gitlab/database_spec.rb
View file @ 931db796
...@@ -119,9 +119,24 @@ describe Gitlab::Database, lib: true do ...@@ -119,9 +119,24 @@ describe Gitlab::Database, lib: true do
it 'creates a new connection pool with specific pool size' do it 'creates a new connection pool with specific pool size' do
pool = described_class.create_connection_pool(5) pool = described_class.create_connection_pool(5)
expect(pool) begin
.to be_kind_of(ActiveRecord::ConnectionAdapters::ConnectionPool) expect(pool)
expect(pool.spec.config[:pool]).to eq(5) .to be_kind_of(ActiveRecord::ConnectionAdapters::ConnectionPool)
expect(pool.spec.config[:pool]).to eq(5)
ensure
pool.disconnect!
end
end
it 'allows setting of a custom hostname' do
pool = described_class.create_connection_pool(5, '127.0.0.1')
begin
expect(pool.spec.config[:host]).to eq('127.0.0.1')
ensure
pool.disconnect!
end
end end
end end
......
spec/requests/api/projects_spec.rb
View file @ 931db796
...@@ -1422,4 +1422,53 @@ describe API::Projects, api: true do ...@@ -1422,4 +1422,53 @@ describe API::Projects, api: true do
end end
end end
end end
describe 'POST /projects/:id/housekeeping' do
let(:housekeeping) { Projects::HousekeepingService.new(project) }
before do
allow(Projects::HousekeepingService).to receive(:new).with(project).and_return(housekeeping)
end
context 'when authenticated as owner' do
it 'starts the housekeeping process' do
expect(housekeeping).to receive(:execute).once
post api("/projects/#{project.id}/housekeeping", user)
expect(response).to have_http_status(201)
end
context 'when housekeeping lease is taken' do
it 'returns conflict' do
expect(housekeeping).to receive(:execute).once.and_raise(Projects::HousekeepingService::LeaseTaken)
post api("/projects/#{project.id}/housekeeping", user)
expect(response).to have_http_status(409)
expect(json_response['message']).to match(/Somebody already triggered housekeeping for this project/)
end
end
end
context 'when authenticated as developer' do
before do
project_member2
end
it 'returns forbidden error' do
post api("/projects/#{project.id}/housekeeping", user3)
expect(response).to have_http_status(403)
end
end
context 'when unauthenticated' do
it 'returns authentication error' do
post api("/projects/#{project.id}/housekeeping")
expect(response).to have_http_status(401)
end
end
end
end end
spec/requests/ci/api/triggers_spec.rb
View file @ 931db796
...@@ -60,7 +60,8 @@ describe Ci::API::Triggers do ...@@ -60,7 +60,8 @@ describe Ci::API::Triggers do
it 'validates variables to be a hash' do it 'validates variables to be a hash' do
post ci_api("/projects/#{project.ci_id}/refs/master/trigger"), options.merge(variables: 'value') post ci_api("/projects/#{project.ci_id}/refs/master/trigger"), options.merge(variables: 'value')
expect(response).to have_http_status(400) expect(response).to have_http_status(400)
expect(json_response['message']).to eq('variables needs to be a hash')
expect(json_response['error']).to eq('variables is invalid')
end end
it 'validates variables needs to be a map of key-valued strings' do it 'validates variables needs to be a map of key-valued strings' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7