summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Set correct timestamps when creating past issues58361-issue-create-system-note-timestampHeinrich Lee Yu2019-04-161-1/+1
| | | | Sets `system_note_timestamp` from `created_at`
* Externalize several strings inMartin Wortschack2019-04-167-15/+18
| | | | | | - app/services - app/controllers - app/presenters
* Merge branch 'downloading-expired-artifacts' into 'master'Grzegorz Bizon2019-04-161-1/+1
|\ | | | | | | | | Don't render artifact download links for builds with expired artifacts See merge request gitlab-org/gitlab-ce!26753
| * Don't render artifact download links on the project tags page for builds ↵drew cimino2019-04-121-1/+1
| | | | | | | | with expired artifacts
* | Merge branch 'winh-boards-store' into 'master'Phil Hughes2019-04-162-1/+19
|\ \ | | | | | | | | | | | | Remove EE-specific code from boards store (CE-backport) See merge request gitlab-org/gitlab-ce!26924
| * | Copy boards store changes from EEwinh-boards-storeWinnie Hellmann2019-04-101-1/+11
| | |
| * | Import BoardsStoreEE conditionallyWinnie Hellmann2019-04-102-0/+8
| | | | | | | | | | | | (cherry picked from commit d79e06149136f01d2a3fce328791bcf70d31c0df)
* | | Autosave description in epicsRajat Jain2019-04-164-4/+65
| | | | | | | | | | | | | | | | | | When editing an epic, the progress was previously lost due to lack of localstorage syncing code. This commit adds support for localstorage sync.
* | | Merge branch 'helm_uninstall_command' into 'master'Sean McGivern2019-04-161-0/+8
|\ \ \ | | | | | | | | | | | | | | | | Helm DeleteCommand See merge request gitlab-org/gitlab-ce!27348
| * | | Implement commands to uninstall cluster applicationshelm_uninstall_commandThong Kuah2019-04-161-0/+8
| | | | | | | | | | | | | | | | | | | | This is the backend part which just allows uninstalling Prometheus for now.
* | | | Merge branch '60026-group-member-count-bg' into 'master'Fatih Acet2019-04-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add badge-pill class on group member count Closes #60026 See merge request gitlab-org/gitlab-ce!27019
| * | | | Add badge-pill class on group member count60026-group-member-count-bgPaul Gascou-Vaillancourt2019-04-121-1/+1
| | | | |
* | | | | Fix remove_source_branch merge request API handlingsh-fix-merge-requests-api-remove-branch-paramStan Hu2019-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users attempting to set merge requests to `remove_source_branch` to `false` would encounter an Error 500 because the UpdateService and API checked `present?`, which would always return `false`. We now just use `has_key?` to decide whether the parameter is present. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60530
* | | | | Merge branch 'sh-fix-pipeline-delete-caching' into 'master'Lin Jen-Shin2019-04-153-52/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly expire all pipeline caches when pipeline is deleted Closes #60469 See merge request gitlab-org/gitlab-ce!27334
| * | | | | Properly expire all pipeline caches when pipeline is deletedsh-fix-pipeline-delete-cachingStan Hu2019-04-153-52/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting a pipeline, only some of the cache structures were being expired, but not the full pipeline list. We have to synchronously schedule a pipeline cache expiration because the pipeline will be deleted if the Sidekiq expiration job picks it up. To do this, properly extract all the logic buried in the Sidekiq worker into a service, and then call the service. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60469
* | | | | | Merge branch 'forbid-the-usage-of-reload' into 'master'Lin Jen-Shin2019-04-1515-18/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forbid the usage of reload Closes #60218 See merge request gitlab-org/gitlab-ce!27125
| * | | | | | Forbid the use of `#reload` and prefer `#reset`forbid-the-usage-of-reloadKamil Trzciński2019-04-1515-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `#reload` makes to load all objects into memory, and the main purpose of `#reload` is to drop the association cache. The `#reset` seems to solve exactly that case.
* | | | | | | Add ability to do variable substitutionReuben Pereira2019-04-151-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In prometheus proxy api, allow variables to be replaced. For example, if 'up{env="%{ci_environment_slug}"}' is passed to the endpoint, it becomes 'up{env="production"}' before being sent to prometheus.
* | | | | | | Added write_repository scope for personal access tokenHoratiu Eugen Vlad2019-04-155-5/+5
| | | | | | |
* | | | | | | Externalize strings detected by rubocop-i18nMartin Wortschack2019-04-1515-56/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Externalize strings in milestones_helper - Externalize strings in app/services - Update PO file
* | | | | | | Merge branch '59873-page-title' into 'master'Phil Hughes2019-04-1511-13/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes stylelint for page_title.scss Closes #59873 See merge request gitlab-org/gitlab-ce!27315
| * | | | | | | Fixes stylelint for page_title.scss59873-page-titleFilipa Lacerda2019-04-1211-13/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Replaces CSS with BS4 Utility classes
* | | | | | | Merge branch 'image-comment-reviews-ce' into 'master'Filipa Lacerda2019-04-155-11/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport of image-comment-reviews See merge request gitlab-org/gitlab-ce!27271
| * | | | | | | CE backport of image-comment-reviewsPhil Hughes2019-04-125-11/+39
| | | | | | | |
* | | | | | | | Display scoped labels in Issue BoardsRajat Jain2019-04-1510-24/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change brings new Scoped labels to Issue board as well. With the last change, this was missed.
* | | | | | | | Merge branch '17014-remove-rails-deprecated_sanitizer' into 'master'Douwe Maan2019-04-152-5/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove rails-deprecated_sanitizer" Closes #17014 See merge request gitlab-org/gitlab-ce!27268
| * | | | | | | | Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizerDmitriy Zaporozhets2019-04-122-5/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Rescue and log errors raised when preparing builds60480-rescue-build-preparing-errorsTiger2019-04-151-3/+5
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/60480
* | | | | | | Merge branch '31331-add-time-tracking-issue-boards-sidebar' into 'master'Tim Zallmann2019-04-125-13/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add time tracking information to Issue Boards sidebar Closes #31331 See merge request gitlab-org/gitlab-ce!27166
| * | | | | | | Add time tracking information to Issue Boards sidebarKushal Pandya2019-04-125-13/+43
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Add time tracking progress bar to Issue Boards sidebar.
* | | | | | | Fix protected branch example failing on masterfix-protected_branches_spec-masterLuke Bennett2019-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Failing due to updates in capybara and selenium driver.
* | | | | | | Merge branch ↵Fatih Acet2019-04-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished' into 'master' Breakpoints.isDesktop should not always return false Closes #60369 See merge request gitlab-org/gitlab-ce!27240
| * | | | | | | Fix isDesktop function to return proper valueSam Bigelow2019-04-121-1/+1
| | | | | | | |
* | | | | | | | Merge branch '11124-update-deployment-service-fails-if-project-is-nil' into ↵Stan Hu2019-04-121-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Always return the deployment in the UpdateDeploymentService#execute method Closes gitlab-ee#11124 See merge request gitlab-org/gitlab-ce!27322
| * | | | | | | Always return the deployment in the execute methodDouglas Barbosa Alexandre2019-04-121-0/+2
| | | | | | | |
* | | | | | | | Merge branch 'gt-fix-styling-for-framework-notes' into 'master'Phil Hughes2019-04-129-19/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styling for `app/assets/stylesheets/framework/notes.scss` Closes #59868 See merge request gitlab-org/gitlab-ce!26877
| * | | | | | | Rename selector for framework notesGeorge Tsiolis2019-04-129-19/+19
| | | | | | | |
* | | | | | | | CE backport of Add Snowplow tracking to notesConstance Okoghenun2019-04-124-0/+21
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bacport of Snowplow tracking for - Reply comment button - Start discussion and Comment buttons
* | | | | | | Merge branch '60241-merge-request-popover-doesn-t-go-away-on-mouse-leave' ↵Phil Hughes2019-04-121-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge Request popover doesn't go away on mouse leave" Closes #60241 See merge request gitlab-org/gitlab-ce!27143
| * | | | | | | Fix bug where MR Popover wont go away60241-merge-request-popover-doesn-t-go-away-on-mouse-leaveSam Bigelow2019-04-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check to make sure eventListener is not added twice
* | | | | | | | Merge branch 'fe-remove-slugify' into 'master'Filipa Lacerda2019-04-121-7/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove slugify text utility See merge request gitlab-org/gitlab-ce!27290
| * | | | | | | Remove slugify text utilityfe-remove-slugifyPaul Slaughter2019-04-121-7/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** This function was not being used and it's documentation was out of date.
* | | | | | | Merge branch '59841-show-commits' into 'master'Phil Hughes2019-04-122-6/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces CSS with utility class See merge request gitlab-org/gitlab-ce!27311
| * | | | | | | Replaces CSS with utility class59841-show-commitsFilipa Lacerda2019-04-122-6/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix-typo-activity-lease' into 'master'Stan Hu2019-04-121-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Fix typo in activity lease See merge request gitlab-org/gitlab-ce!27288
| * | | | | | Fix typo in activity leasefix-typo-activity-leaseCindy Pallares2019-04-111-1/+1
| | |/ / / / | |/| | | |
* | | | | | Fix grouping wiki pages by directoryIgor2019-04-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a page has the same name as a directory the WikiPage#group_by_directory method can have a wrong behaviour This commit fixes it
* | | | | | Do not rescue errors from state transitionsThong Kuah2019-04-123-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this are un-expected errors which we should hear about from Sentry. Still rescue StandardError when operating a Helm action as we can get non Kubeclient errors such as SSL certificate or network errors
* | | | | | Merge branch '59925-reports' into 'master'Phil Hughes2019-04-121-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unused CSS in reports Closes #59925 See merge request gitlab-org/gitlab-ce!27310
| * | | | | | Removes unused CSSFilipa Lacerda2019-04-121-5/+0
| | |/ / / / | |/| | | |