summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* button fixesgitlab-ui-buttonsAndrew Fontaine2019-07-192-6/+9
|
* Fix Alignment of Resolved Threads CounterAndrew Fontaine2019-07-194-15/+18
| | | | | Fixes the button group alignments of the threads-resolved counter and buttons
* Style Dropdown Buttons with New Button StylesAndrew Fontaine2019-07-1935-47/+66
| | | | | These dropdown buttons were missing the `btn` class, and were missing the new button styles.
* Remove Not Disabled Selectors on ButtonsAndrew Fontaine2019-07-191-44/+42
| | | | | As far as I can tell, there's no reason for the `:not(.disabled):not(:disabled)` check here.
* Revert "Merge branch 'revert-af42c169' into 'master'"Andrew Fontaine2019-07-1915-89/+98
| | | | | This reverts commit 1cb21ec289a223fe30d2d8977f4dd0238b24c6da, reversing changes made to 3fcf951c8bcbc5dad120e60ff4215dde2d7f3c7d.
* Revert "Merge branch 'revert-222d0019' into 'master'"Andrew Fontaine2019-07-192-1/+6
| | | | | This reverts commit b55fc93be0d244f10960d04c7143adeb148fb4f4, reversing changes made to f0400dc7c01ab53cdc286d639b50e1ce98a9beaf.
* Merge branch 'docs-qa-replace-act-with-perform' into 'master'Dan Davison2019-07-181-1/+1
|\ | | | | | | | | Fix QA documentation to refer to perform method See merge request gitlab-org/gitlab-ce!30872
| * Fix QA documentation to refer to perform methodDan Davison2019-07-181-1/+1
|/ | | | | | The documentation referred to the .act method This MR changes this to refer to the preferred .perform method
* Merge branch ↵Bob Van Landuyt2019-07-183-0/+30
|\ | | | | | | | | | | | | '10270-milestones-should-not-be-set-on-epics-issue-promotion-ce' into 'master' CE port for milestones should not be set on epics issue promotion See merge request gitlab-org/gitlab-ce!30633
| * CE port for milestones should not be set on epics issue promotionEugenia Grieff2019-07-183-0/+30
|/
* Merge branch 'group-milestones-dashboard-blunceford' into 'master'Sean McGivern2019-07-183-4/+19
|\ | | | | | | | | | | | | Fix bug in dashboard display of closed milestones Closes #59381 See merge request gitlab-org/gitlab-ce!30820
| * Removed name from changelog entryblunceford2019-07-181-1/+1
| |
| * Cleaned up tests for group milestonesblunceford2019-07-171-14/+3
| |
| * Added changelog entry for fixblunceford2019-07-161-0/+5
| |
| * Fix bug with closed milestones in dashboardblunceford2019-07-162-2/+23
| |
* | Merge branch 'rs-haml-lint-rubocop-syntax' into 'master'Stan Hu2019-07-183-4/+6
|\ \ | | | | | | | | | | | | | | | | | | Enable RuboCop syntax linting in haml-lint Closes #64753 See merge request gitlab-org/gitlab-ce!30903
| * | Fix syntax errors in devise/sessions/_new_ldapRobert Speicher2019-07-181-2/+2
| | |
| * | Fix haml-lint RuboCop error in admin/users/indexRobert Speicher2019-07-181-1/+1
| | |
| * | Ensure haml-lint checks SyntaxRobert Speicher2019-07-181-1/+3
| | | | | | | | | | | | Also ensures we check Syntax with RuboCop, which is different.
* | | Merge branch 'fix-fetch-test-repos' into 'master'Stan Hu2019-07-181-12/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix broken handling for outdated test repos See merge request gitlab-org/gitlab-ce!30893
| * | | Fix broken handling for outdated test reposfix-fetch-test-reposMarkus Koller2019-07-181-12/+1
| | | | | | | | | | | | | | | | | | | | The call to init had the side effect of starting another Gitaly process, and didn't actually correctly delete the test repositories.
* | | | Merge branch 'bjk/usage_ping' into 'master'Stan Hu2019-07-183-5/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update usage ping cron behavior See merge request gitlab-org/gitlab-ce!30842
| * | | | Update usage ping cron behaviorbjk/usage_pingBen Kochie2019-07-183-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Splay the start by sleeping up to one minute. * Adjust sideikiq retries to try up to approximately three hours. * Randomize the minute fully within the hour. * Psudo-randomize the day of the week based on the instance UUID.
* | | | | Merge branch 'improve-add-timestamps' into 'master'Mayra Cabrera2019-07-182-13/+135
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improves add_timestamps_with_timezone helper See merge request gitlab-org/gitlab-ce!30720
| * | | | | Improves add_timestamps_with_timezone helperAlex Kalderimis2019-07-182-13/+135
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the `add_timestamps_with_timezone` helper by allowing the column names to be configured. This has the advantage that unnecessary columns can be avoided, saving space. A helper for removing the columns is also provided, to be used in the `down` method of migrations.
* | | | | Merge branch 'sh-add-rugged-logs' into 'master'Douglas Barbosa Alexandre2019-07-187-2/+106
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Add Rugged calls and duration to API and Rails logs Closes #64676 See merge request gitlab-org/gitlab-ce!30871
| * | | | Add Rugged calls and duration to API and Rails logsStan Hu2019-07-187-2/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds `rugged_duration_ms` and `rugged_calls` fields to `api_json.log` and `production_json.log`. This will make it easier to identify performance issues caused by excessive I/O. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64676
* | | | | Merge branch 'add-profile-mode-to-extend-request-profiling' into 'master'Kamil Trzciński2019-07-1810-69/+221
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add profile mode to extend request profiling See merge request gitlab-org/gitlab-ce!30126
| * | | | | Add profile mode to extend request profilingadd-profile-mode-to-extend-request-profilingQingyu Zhao2019-07-1810-69/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the support for "X-Profile-Token: <token>" to have an additional header that defines type of profile we are looking for, like: X-Profile-Mode: execution X-Profile-Mode: memory
* | | | | | Merge branch '63870-fix-pid-providing-for-prometheus' into 'master'Kamil Trzciński2019-07-183-2/+122
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pid providing for Prometheus Closes #63870 See merge request gitlab-org/gitlab-ce!30474
| * | | | | | Fix pid providing for PrometheusAleksei Lipniagov2019-07-183-2/+122
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative worker identifier for metrics (instead of Process.pid) and identify when Unicorn/Puma/Sidekiq is used. Previously, it was assumed that all metrics are gathered from Unicorn due to hardcoded implementation which was incorrect.
* | | | | | Merge branch 'sh-fix-redis-performance-bar' into 'master'Mayra Cabrera2019-07-185-34/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistency in Redis performance bar stats Closes #64707 See merge request gitlab-org/gitlab-ce!30866
| * | | | | | Fix inconsistency in Redis performance bar statssh-fix-redis-performance-barStan Hu2019-07-175-34/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | peek-redis resets its counters at the start of an ActionController notification (`start_processing.action_controller`), which causes it to miss some Redis queries that precede it, such as the database load balancer and Rack Attack queries. This produces inconsistencies in the performance bar between the number of calls and their durations with the actual calls in the detailed view. We fix this by getting rid of peek-redis in favor of consolidating all logic into the `RedisDetailed` view, which tracks Redis queries using `RequestStore`. This has the nice property of removing thread-specific counters as well. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64707
* | | | | | | Merge branch '64669-fixed-tooltip' into 'master'Phil Hughes2019-07-185-21/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tooltips on note timestamps not showing for issues" Closes #64669 See merge request gitlab-org/gitlab-ce!30846
| * | | | | | Resolve "Tooltips on note timestamps not showing for issues"Natalia Tepluhina2019-07-185-21/+21
|/ / / / / /
* | | | | | Merge branch 'ci_default_git_depth_only' into 'master'Douglas Barbosa Alexandre2019-07-182-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Allow changing only ci_default_git_depth See merge request gitlab-org/gitlab-ce!30888
| * | | | | | API: Allow changing only ci_default_git_depthMathieu Parent2019-07-182-0/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'qa-selector-uniformization-common-1' into 'master'Sanad Liaquat2019-07-187-16/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor common Page Objects to use data tags (No. 1 Contd.) See merge request gitlab-org/gitlab-ce!30758
| * | | | | | Refactor common Page Objects to use data tagsDan Davison2019-07-187-16/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Common usages within GitLab QA include Login Page, navigation bars and layouts
* | | | | | Merge branch '10857-parse-multiple-reports-of-same-category-ce' into 'master'James Lopez2019-07-182-0/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE backport] Parse and store multiple security reports of the same category See merge request gitlab-org/gitlab-ce!30658
| * | | | | | [CE backport] Parse and store multiple security reports of the same categoryVictor Zagorodny2019-07-182-0/+40
|/ / / / / /
* | | | | | Merge branch '58583-confidential-mr-docs' into 'master'Marcia Ramos2019-07-184-0/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Merge Requests for Confidential Issues See merge request gitlab-org/gitlab-ce!30553
| * | | | | | Doc: resolving confidential issues in private forkPatrick Bajao2019-07-184-0/+51
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a section in Confidential Issues documentation with information about the "Create confidential merge request" button/dropdown and how it can help in resolving confidential issues.
* | | | | | Merge branch 'webide-commit-use-correct-parent' into 'master'Nick Thomas2019-07-1817-99/+247
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use correct parent when committing in WebIDE See merge request gitlab-org/gitlab-ce!29598
| * | | | | | FE remove create branch call in IDE commitwebide-commit-use-correct-parentPaul Slaughter2019-07-184-37/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `start_sha` was intercepted on the frontend to create the correct branch in a separate API call. Now that the commits API supports the `start_sha` parameter directly this workaround is not needed anymore.
| * | | | | | Add start_sha to commits APIMarkus Koller2019-07-1813-62/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing start_branch on committing from the WebIDE, it's possible that the branch has changed since editing started, which results in the change being applied on top of the latest commit in the branch and overwriting the new changes. By passing the start_sha instead we can make sure that the change is applied on top of the commit which the user started editing from.
* | | | | | | Merge branch 'feature/gb/serverless-app-deployment-template' into 'master'Thong Kuah2019-07-183-29/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy serverless apps with `gitlabktl` Closes #64494 See merge request gitlab-org/gitlab-ce!30740
| * | | | | | | Add changelog entry for serverless apps deploymentfeature/gb/serverless-app-deployment-templateGrzegorz Bizon2019-07-151-0/+5
| | | | | | | |
| * | | | | | | Update docs on serverless apps deploymentsGrzegorz Bizon2019-07-151-21/+16
| | | | | | | |
| * | | | | | | Deploy serverless apps with `gitlabktl`Grzegorz Bizon2019-07-151-8/+5
| | | | | | | |