Commit 1338fdf4 authored by Rémy Coutable's avatar Rémy Coutable

Merge remote-tracking branch 'origin/master' into ce_upstream

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parents fb49b072 9b477ff1
Please view this file on the master branch, on stable branches it's out of date.
## 9.0.0 (2017-03-22)
- Geo: Replicate repository creation in Geo secondary node. !952
- Make approval system notes lowercase. !1125
- Issues can be exported as CSV, via email. !1126
- Try to update mirrors again after 15 minutes if the previous update failed. !1183
- Adds abitlity to render deploy boards in the frontend side. !1233
- Add filtered search to MR page. !1243
- Update project list API returns with approvals_before_merge attribute. !1245 (Geoff Webster)
- Catch Net::LDAP::DN exceptions in EE::Gitlab::LDAP::Group. !1260
- API: Use `post ":id/#{type}/:subscribable_id/subscribe"` to subscribe and `post ":id/#{type}/:subscribable_id/unsubscribe"` to unsubscribe from a resource. !1274 (Robert Schilling)
- API: Remove deprecated fields Notes#upvotes and Notes#downvotes. !1275 (Robert Schilling)
- Deploy board backend. !1278
- API: Remove the ProjectGitHook API. !1301 (Robert Schilling)
- Expose elasticsearch client params for AWS signing and HTTPS. !1305 (Matt Gresko)
- Fix LDAP DN case-mismatch bug in LDAP group sync. !1337
- Remove es6 file extension from JavaScript files. !1344 (winniehell)
- Geo: Don't load dependent models when fetching an existing GeoNode from the database. !1348
- Parallelise the gitlab:elastic:index_database Rake task. !1361
- Robustify reading attributes for elasticsearch. !1365
- Introduce one additional thread into bin/elastic_repo_indexer. !1372
- Show hook errors for fast-forward merges. !1375
- Allow all parameters of group webhooks to be set through the UI. !1376
- Fix Elasticsearch queries when a group_id is specified. !1423
- Check the right index mapping based on Rails environment for rake gitlab:elastic:add_feature_visiblity_levels_to_project. !1473
- Fix issues with another milestone that has a matching list label could not be added to a board.
- Only admins or group owners can set LDAP overrides.
- Add support for load balancing database queries.
- Only replace non-approval mr-widget-footer on getMergeStatus.
- Remove repository_storage from V4 "/application/settings" settings API.
- Added headers to protected branches access dropdowns.
- Remove support for Git Annex.
- Repositioned multiple issue boards selector.
- Added back weight in issue rows on issue list.
- Add basic support for GitLab Geo file transfers over HTTP.
- Added weight slash command.
- Set deployment status invalid when the environments does not match a k8s label.
- Combined deploy keys, push rules, protect branches and mirror repository settings options into a single one called Repository.
- Rebase - fix commiter email & name.
- Adds a EE specific dev favicon.
- Elastic security fix: Respect feature visibility level.
- Update Elasticsearch to 5.1.
- [Elasticsearch] More efficient search.
- Get Geo secondaries nodes statuses over AJAX.
## 8.17.4 (2017-03-19)
- Elastic security fix: Respect feature visibility level.
......
This diff is collapsed.
......@@ -4,6 +4,8 @@
import FilteredSearchBoards from './filtered_search_boards';
import eventHub from './eventhub';
import collapseIcon from './icons/fullscreen_collapse.svg';
import expandIcon from './icons/fullscreen_expand.svg';
window.Vue = require('vue');
window.Vue.use(require('vue-resource'));
......@@ -29,6 +31,7 @@ $(() => {
const $boardApp = document.getElementById('board-app');
const Store = gl.issueBoards.BoardsStore;
const ModalStore = gl.issueBoards.ModalStore;
const issueBoardsContent = document.querySelector('.js-focus-mode-board');
window.gl = window.gl || {};
......@@ -116,7 +119,7 @@ $(() => {
},
mounted () {
gl.issueBoards.newListDropdownInit();
}
},
});
gl.IssueBoardsModalAddBtn = new Vue({
......@@ -125,6 +128,7 @@ $(() => {
data: {
modal: ModalStore.store,
store: Store.state,
isFullscreen: false,
},
watch: {
disabled() {
......@@ -145,7 +149,7 @@ $(() => {
},
methods: {
updateTooltip() {
const $tooltip = $(this.$el);
const $tooltip = $(this.$refs.addIssuesButton);
this.$nextTick(() => {
if (this.disabled) {
......@@ -160,21 +164,45 @@ $(() => {
this.toggleModal(true);
}
},
toggleFocusMode() {
$(this.$refs.toggleFocusModeButton).tooltip('hide');
issueBoardsContent.classList.toggle('is-focused');
this.isFullscreen = !this.isFullscreen;
},
},
mounted() {
this.updateTooltip();
},
template: `
<button
class="btn btn-create pull-right prepend-left-10"
type="button"
data-placement="bottom"
:class="{ 'disabled': disabled }"
:title="tooltipTitle"
:aria-disabled="disabled"
@click="openModal">
Add issues
</button>
<div class="board-extra-actions">
<button
class="btn btn-create prepend-left-10"
type="button"
data-placement="bottom"
ref="addIssuesButton"
:class="{ 'disabled': disabled }"
:title="tooltipTitle"
:aria-disabled="disabled"
@click="openModal">
Add issues
</button>
<a
href="#"
class="btn btn-default has-tooltip prepend-left-10"
role="button"
aria-label="Toggle focus mode"
title="Toggle focus mode"
ref="toggleFocusModeButton"
@click="toggleFocusMode">
<span v-show="isFullscreen">
${collapseIcon}
</span>
<span v-show="!isFullscreen">
${expandIcon}
</span>
</a>
</div>
`,
});
......
<svg width="17" height="17" viewBox="0 0 17 17" xmlns="http://www.w3.org/2000/svg"><path d="M.147 15.496l2.146-2.146-1.286-1.286a.55.55 0 0 1-.125-.616c.101-.238.277-.357.527-.357h4a.55.55 0 0 1 .402.17.55.55 0 0 1 .17.401v4c0 .25-.12.426-.358.527-.232.101-.437.06-.616-.125l-1.286-1.286-2.146 2.146-1.428-1.428zM14.996.646l1.428 1.43-2.146 2.145 1.286 1.286c.185.179.226.384.125.616-.101.238-.277.357-.527.357h-4a.55.55 0 0 1-.402-.17.55.55 0 0 1-.17-.401v-4c0-.25.12-.426.358-.527a.553.553 0 0 1 .616.125l1.286 1.286L14.996.647zm-13.42 0L3.72 2.794l1.286-1.286a.55.55 0 0 1 .616-.125c.238.101.357.277.357.527v4a.55.55 0 0 1-.17.402.55.55 0 0 1-.401.17h-4c-.25 0-.426-.12-.527-.358-.101-.232-.06-.437.125-.616l1.286-1.286L.147 2.075 1.575.647zm14.848 14.85l-1.428 1.428-2.146-2.146-1.286 1.286c-.179.185-.384.226-.616.125-.238-.101-.357-.277-.357-.527v-4a.55.55 0 0 1 .17-.402.55.55 0 0 1 .401-.17h4c.25 0 .426.12.527.358a.553.553 0 0 1-.125.616l-1.286 1.286 2.146 2.146z" fill-rule="evenodd"/></svg>
<svg width="15" height="15" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg"><path d="M8.591 5.056l2.147-2.146-1.286-1.286a.55.55 0 0 1-.125-.616c.101-.238.277-.357.527-.357h4a.55.55 0 0 1 .402.17.55.55 0 0 1 .17.401v4c0 .25-.12.426-.358.527-.232.101-.437.06-.616-.125l-1.286-1.286-2.146 2.147-1.429-1.43zM5.018 8.553l1.429 1.43L4.3 12.127l1.286 1.286c.185.179.226.384.125.616-.101.238-.277.357-.527.357h-4a.55.55 0 0 1-.402-.17.55.55 0 0 1-.17-.401v-4c0-.25.12-.426.358-.527a.553.553 0 0 1 .616.125L2.872 10.7l2.146-2.147zm4.964 0l2.146 2.147 1.286-1.286a.55.55 0 0 1 .616-.125c.238.101.357.277.357.527v4a.55.55 0 0 1-.17.402.55.55 0 0 1-.401.17h-4c-.25 0-.426-.12-.527-.358-.101-.232-.06-.437.125-.616l1.286-1.286-2.147-2.146 1.43-1.429zM6.447 5.018l-1.43 1.429L2.873 4.3 1.586 5.586c-.179.185-.384.226-.616.125-.238-.101-.357-.277-.357-.527v-4a.55.55 0 0 1 .17-.402.55.55 0 0 1 .401-.17h4c.25 0 .426.12.527.358a.553.553 0 0 1-.125.616L4.3 2.872l2.147 2.146z" fill-rule="evenodd"/></svg>
......@@ -55,7 +55,7 @@ export default class EnvironmentsStore {
if (filtered.size > 1) {
filtered = Object.assign(filtered, env, { isFolder: true, folderName: env.name });
} else if (filtered.size === 1 && filtered.rollout_status_path) {
filtered = Object.assign(filtered, env, {
filtered = Object.assign({}, env, filtered, {
hasDeployBoard: true,
isDeployBoardVisible: false,
deployBoardData: {},
......
......@@ -60,6 +60,26 @@
}
}
.board-extra-actions {
font-size: 0;
white-space: nowrap;
}
@media (min-width: $screen-sm-min) {
.issue-boards-content.is-focused {
position: fixed;
width: 100%;
height: 100%;
top: 0;
background: $white-light;
z-index: 100;
.boards-list {
height: calc(100vh - 50px);
}
}
}
.boards-app {
position: relative;
}
......
......@@ -184,6 +184,7 @@
.deploy-board-instances {
order: 2;
margin-left: 20px;
width: 100%;
.text {
color: $gl-text-color-secondary;
......
......@@ -8,12 +8,6 @@ class Projects::PushRulesController < Projects::ApplicationController
layout "project_settings"
def index
project.create_push_rule unless project.push_rule
@push_rule = project.push_rule
end
def update
@push_rule = project.push_rule
@push_rule.update_attributes(push_rule_params)
......
......@@ -2,7 +2,6 @@ module Projects
module Settings
class RepositoryController < Projects::ApplicationController
before_action :authorize_admin_project!
before_action :push_rule, only: [:show]
before_action :remote_mirror, only: [:show]
def show
......@@ -10,6 +9,9 @@ module Projects
.new(@project, current_user: current_user)
define_protected_branches
project.create_push_rule unless project.push_rule
@push_rule = project.push_rule
end
private
......@@ -20,10 +22,6 @@ module Projects
load_gon_index
end
def push_rule
@push_rule ||= PushRule.find_or_create_by(is_sample: true)
end
def remote_mirror
@remote_mirror = @project.remote_mirrors.first_or_initialize
end
......
......@@ -11,17 +11,24 @@ module Geo
def execute
try_obtain_lease do |lease|
case object_type
when :lfs
download_lfs_object
else
log("unknown file type: #{object_type}")
end
bytes_downloaded = downloader.execute
success = bytes_downloaded && bytes_downloaded >= 0
update_registry(bytes_downloaded) if success
end
end
private
def downloader
begin
klass = Gitlab::Geo.const_get("#{object_type.capitalize}Downloader")
klass.new(object_db_id)
rescue NameError
log("unknown file type: #{object_type}")
raise
end
end
def try_obtain_lease
uuid = Gitlab::ExclusiveLease.new(lease_key, timeout: LEASE_TIMEOUT).try_obtain
......@@ -34,20 +41,6 @@ module Geo
end
end
def download_lfs_object
lfs_object = LfsObject.find_by_id(object_db_id)
return unless lfs_object.present?
transfer = ::Gitlab::Geo::LfsTransfer.new(lfs_object)
bytes_downloaded = transfer.download_from_primary
success = bytes_downloaded && bytes_downloaded >= 0
update_registry(bytes_downloaded) if success
success
end
def log(message)
Rails.logger.info "#{self.class.name}: #{message}"
end
......
- board = local_assigns.fetch(:board, nil)
- @no_container = true
- @content_class = "issue-boards-content"
- @content_class = "issue-boards-content js-focus-mode-board"
- page_title "Boards"
- content_for :page_specific_javascripts do
......
---
title: 'Geo: Replicate repository creation in Geo secondary node'
merge_request: 952
author:
---
title: Expose elasticsearch client params for AWS signing and HTTPS
merge_request: 1305
author: Matt Gresko
---
title: "Update project list API returns with approvals_before_merge attribute"
merge_request: 1245
author: Geoff Webster
\ No newline at end of file
---
title: Fix LDAP DN case-mismatch bug in LDAP group sync
merge_request: 1337
author:
---
title: Issues can be exported as CSV, via email
merge_request: 1126
author:
---
title: Deploy board backend
merge_request: 1278
author:
---
title: Adds abitlity to render deploy boards in the frontend side
merge_request: 1233
author:
---
title: Introduce one additional thread into bin/elastic_repo_indexer
merge_request: 1372
author:
---
title: Remove repository_storage from V4 "/application/settings" settings API
merge_request:
author:
---
title: 'Geo: Don''t load dependent models when fetching an existing GeoNode from the
database'
merge_request: 1348
author:
---
title: Parallelise the gitlab:elastic:index_database Rake task
merge_request: 1361
author:
---
title: Robustify reading attributes for elasticsearch
merge_request: 1365
author:
---
title: Show hook errors for fast-forward merges
merge_request: 1375
author:
---
title: Allow all parameters of group webhooks to be set through the UI
merge_request: 1376
author:
---
title: Fix Elasticsearch queries when a group_id is specified
merge_request: 1423
author:
---
title: Combined deploy keys, push rules, protect branches and mirror repository settings options into a single one called
Repository
merge_request:
author:
---
title: Rebase - fix commiter email & name
merge_request:
author:
---
title: Add filtered search to MR page
merge_request: 1243
author:
---
title: 'API: Remove deprecated fields Notes#upvotes and Notes#downvotes'
merge_request: 1275
author: Robert Schilling
---
title: 'API: Use `post ":id/#{type}/:subscribable_id/subscribe"` to subscribe and
`post ":id/#{type}/:subscribable_id/unsubscribe"` to unsubscribe from a resource'
merge_request: 1274
author: Robert Schilling
---
title: Catch Net::LDAP::DN exceptions in EE::Gitlab::LDAP::Group
merge_request: 1260
author:
---
title: Adds a EE specific dev favicon
merge_request:
author:
---
title: 'Elastic security fix: Respect feature visibility level'
merge_request:
author:
---
title: Update Elasticsearch to 5.1
merge_request:
author:
---
title: "[Elasticsearch] More efficient search"
merge_request:
author:
---
title: Get Geo secondaries nodes statuses over AJAX
merge_request:
author:
---
title: Fix issues with another milestone that has a matching list label could not be added to a board
merge_request:
author:
---
title: Only admins or group owners can set LDAP overrides
merge_request:
author:
---
title: Add support for load balancing database queries
merge_request:
author:
---
title: Try to update mirrors again after 15 minutes if the previous update failed
merge_request: 1183
author:
---
title: Only replace non-approval mr-widget-footer on getMergeStatus.
merge_request:
author:
---
title: Make approval system notes lowercase
merge_request: 1125
author:
---
title: Added headers to protected branches access dropdowns
merge_request:
author:
---
title: 'API: Remove the ProjectGitHook API'
merge_request: 1301
author: Robert Schilling
---
title: Remove es6 file extension from JavaScript files
merge_request: 1344
author: winniehell
---
title: Repositioned multiple issue boards selector
merge_request:
author:
---
title: Added back weight in issue rows on issue list
merge_request:
author:
---
title: 'Add basic support for GitLab Geo file transfers over HTTP'
merge_request:
author:
---
title: Added weight slash command
merge_request:
author:
---
title: Set deployment status invalid when the environments does not match a k8s label
merge_request:
author:
---
title: Optionally make users created via the API set their password
merge_request: 8957
author: Joost Rijneveld
---
title: Deleting a user doesn't delete issues they've created/are assigned to
merge_request: 7393
author:
---
title: Redo internals of Incoming Mail Support
merge_request: 9385
author:
---
title: "GET 'projects/:id/repository/commits' endpoint improvements"
merge_request: 9679
author: George Andrinopoulos, Jordan Ryan Reuter
---
title: Move /projects/fork/:id to /projects/:id/fork
merge_request: 8940
author:
---
title: Add runner version to /admin/runners view
merge_request: 8733
author: Jonathon Reinhart
---
title: Remove remnants of git annex support.
merge_request:
author:
---
title: Align bulk update issues button to the right
merge_request:
author:
---
title: Execute web hooks for WikiPage delete operation
merge_request: 8198
author:
---
title: Add the Username to the HTTP(S) clone URL of a Repository
merge_request: 9347
author: Jan Christophersen
---
title: Hide issue info when project issues are disabled
merge_request:
author: George Andrinopoulos
---
title: Remove plus icon from MR button on compare view
merge_request:
author:
---
title: 'Add member: Always return 409 when a member exists'
merge_request:
author:
---
title: Download snippets with LF line-endings by default
merge_request: 8999
author:
---
title: SanitizationFilter allows html5 details and summary tags
merge_request: 6568
author:
---
title: Adds API endpoint to fetch all merge request for a single milestone
merge_request:
author: Joren De Groof
---
title: Standardize branch name params as branch on V4 API
merge_request: 8936
author:
---
title: Align task list checkboxes
merge_request: 6487
author: Jared Deckard <jared.deckard@gmail.com>
---
title: Fix Sort dropdown reflow issue
merge_request: 9533
author: Jarkko Tuunanen
---
title: Add discussion events to contributions calendar
merge_request: 8821
author:
---
title: V3 deprecated templates endpoints removal
merge_request: 8853
author:
---
title: Add spec for todo with target_type Commit
merge_request: 9351
author: George Andrinopoulos
---
title: 'API: Consolidate /projects endpoint'
merge_request: 8962
author:
---
title: Make Git history follow renames again by performing the --skip in Ruby
merge_request:
author:
---
title: 'API: remove `public` param for projects'
merge_request: 8736
author:
---
title: Show directory hierarchy when listing wiki pages
merge_request: 8133
author: Alex Braha Stoll
---
title: Fix position of counter in milestone panels
merge_request: 7842
author: Andrew Smith (EspadaV8)
---
title: Re-add Assign to me link to Merge Request and Issues
merge_request:
author:
---
title: Drop unused ci_projects table and some unused project_id columns,
then rename gl_project_id to project_id. Stop exporting job trace when
exporting projects.
merge_request: 9378
author: David Wagner
---
title: Show Issues mentioned / being closed from a Merge Requests title below the
'Accept Merge Request' button
merge_request: 9194
author: Jan Christophersen
---
title: hide loading spinners for server-rendered sidebar fields
merge_request:
author:
---
title: Added a feature to create a 'directly addressed' Todo when mentioned in the beginning of a line.
merge_request: 7926
author: Ershad Kunnakkadan
---
title: Fix typo in Gitlab config file
merge_request: 9702
author: medied
---
title: Remove support for Git Annex
title: added focus mode button to issue boards
merge_request:
author:
---
title: Manage user personal access tokens through api and add impersonation tokens
merge_request: 9099
author: Simon Vocella
---
title: Introduce /award slash command; Allow posting of just an emoji in comment
merge_request: 9382
author: mhasbini
---
title: Todo done clicking is kind of unusable
merge_request: 8691
author: Jacopo Beschi @jacopo-beschi
---
title: Filter by projects in the end of search
merge_request: 9030
author:
---
title: Responsive title in diffs inline, side by side, with and without sidebar
merge_request: 8475
author:
---
title: Add button to create issue for failing build
merge_request: 9391
author: Alex Sanford
---
title: Added AsciiDoc Snippet to CI/CD Badges
merge_request: 9164
author: Jan Christophersen
---
title: Make documentation of list repository tree API call more detailed
merge_request: 9532
author: Marius Kleiner
---
title: Set dropdown height fixed to 250px and make it scrollable
merge_request: 9063
author:
---
title: Added 'Most Recent Activity' header to the User Profile page
merge_request: 9189
author: Jan Christophersen
---
title: Add Links to Branches in Calendar Activity
merge_request: 9224
author: Jan Christophersen
---
title: Show public RSS feeds to anonymous users
merge_request: 9596
author: Michael Kozono
---
title: Unify issues search behavior by always filtering when ALL labels matches
merge_request: 8849
author:
---
title: Clean-up Groups navigation order
merge_request: 9309
author:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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