summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '41875-allow-pipelines-to-be-deleted-by-project-owners' into 'ma...Grzegorz Bizon2018-11-162-0/+17
|\
| * Raise exception when user is not authorizedMatija Čupić2018-11-131-1/+1
| * Authorize DestroyPipelineService against pipelineMatija Čupić2018-11-133-3/+6
| * Destroy pipeline in serviceMatija Čupić2018-11-122-0/+14
* | Merge branch 'gt-rename-diffs-store-variable' into 'master'Phil Hughes2018-11-162-2/+2
|\ \
| * | Rename diffs store variableGeorge Tsiolis2018-11-152-2/+2
* | | Merge branch 'gt-replace-weight-icon-ce' into 'master'Kushal Pandya2018-11-161-0/+4
|\ \ \
| * | | Replace weight iconGeorge Tsiolis2018-11-161-0/+4
* | | | Merge branch 'refactor-enums-for-ee' into 'master'Robert Speicher2018-11-167-34/+82
|\ \ \ \
| * | | | Refactor how a few ActiveRecord enums are definedrefactor-enums-for-eeYorick Peterse2018-11-157-34/+82
| | |/ / | |/| |
* | | | Merge branch 'image-discussion-ff-fix' into 'master'Filipa Lacerda2018-11-163-13/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed image discussion stylingPhil Hughes2018-11-163-13/+10
* | | | Merge branch '49726-upgrade-helm-to-2-11' into 'master'Kamil Trzciński2018-11-161-0/+7
|\ \ \ \
| * | | | Extract Helm::ClientCommand for shared commandsDylan Griffith2018-11-161-0/+3
| * | | | Upgrade helm to 2.11.0 and upgrade on every installDylan Griffith2018-11-161-0/+4
| | |_|/ | |/| |
* | | | Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'Grzegorz Bizon2018-11-161-1/+0
|\ \ \ \
| * | | | Strictly require a pipeline to mergeMatija Čupić2018-11-081-1/+0
* | | | | Merge branch 'backport-service-hook-execute-arguments' into 'master'Robert Speicher2018-11-161-2/+2
|\ \ \ \ \
| * | | | | Backport ServiceHook#execute from EEbackport-service-hook-execute-argumentsYorick Peterse2018-11-151-2/+2
* | | | | | Merge branch 'fix-typo-pipline-to-pipeline' into 'master'Grzegorz Bizon2018-11-161-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo pipline to pipelinejumpyoshim2018-11-161-1/+1
* | | | | | | Merge branch 'if-53347_fix_impersonation_tokens' into 'master'Stan Hu2018-11-155-17/+23
|\ \ \ \ \ \ \
| * | | | | | | Display impersonation token value only after creationif-53347_fix_impersonation_tokensImre Farkas2018-11-125-17/+23
| | |_|/ / / / | |/| | | | |
* | | | | | | Remove unused project methodGeorge Tsiolis2018-11-151-4/+0
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch '54021-empty-button' into 'master'Phil Hughes2018-11-151-1/+1
|\ \ \ \ \ \
| * | | | | | Prevents empty button in jobs empty state54021-empty-buttonFilipa Lacerda2018-11-141-1/+1
* | | | | | | Remove display of local Sidekiq process in /admin/sidekiqStan Hu2018-11-152-43/+0
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'fix-typos' into 'master'Phil Hughes2018-11-153-3/+3
|\ \ \ \ \ \
| * | | | | | Fix types commentyukihir02018-11-153-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Add knative client to kubeclient libraryChris Baumbauer2018-11-151-0/+4
| |_|_|_|/ |/| | | |
* | | | | Ignore environment validation failureShinya Maeda2018-11-151-0/+4
* | | | | Merge branch 'osw-remove-comment-on-any-diff-line-ff' into 'master'Douwe Maan2018-11-151-6/+1
|\ \ \ \ \
| * | | | | Remove 'comment_on_any_diff_line' feature flagosw-remove-comment-on-any-diff-line-ffOswaldo Ferreira2018-11-141-6/+1
* | | | | | Merge branch 'notes-consistent-key-object-case' into 'master'Filipa Lacerda2018-11-1524-269/+252
|\ \ \ \ \ \
| * | | | | | Made diff & note data consistentPhil Hughes2018-11-1424-269/+252
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '53882-extra-container-diff-version' into 'master'Fatih Acet2018-11-141-2/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Tweak vertical line to line up with system notes and comment avatars53882-extra-container-diff-versionAnnabel Dunstone Gray2018-11-141-1/+1
| * | | | | Add back margin on discussion system notesAnnabel Dunstone Gray2018-11-141-1/+1
| * | | | | Remove box on diff tab system noteAnnabel Dunstone Gray2018-11-141-0/+17
| * | | | | Fix version system noteAnnabel Dunstone Gray2018-11-141-1/+7
* | | | | | Merge branch 'dm-commit-email-select-options' into 'master'Stan Hu2018-11-141-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix bug causing not all emails to show up in commit email selectboxDouwe Maan2018-11-141-1/+1
* | | | | | Merge branch '53918-snippet-commit-comments' into 'master'Fatih Acet2018-11-142-4/+24
|\ \ \ \ \ \
| * | | | | | Fix styling of snippet and commit discussion comments53918-snippet-commit-commentsAnnabel Dunstone Gray2018-11-142-4/+24
* | | | | | | Merge branch 'discussion-fixes-2' into 'master'Fatih Acet2018-11-142-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix diff border radiusdiscussion-fixes-2Annabel Dunstone Gray2018-11-141-1/+1
| * | | | | | Fix vertical line alignment in discussionAnnabel Dunstone Gray2018-11-141-1/+1
* | | | | | | Add white background to commit diff commentsAnnabel Dunstone Gray2018-11-141-0/+4
|/ / / / / /
* | | | | | Merge branch 'fl-gitlab-ui-cicd' into 'master'Clement Ho2018-11-146-53/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Removes jquery as a dependencyFilipa Lacerda2018-11-141-4/+3