summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Introduce predictable environment slugs64295-predictable-environment-slugsTiger2019-07-195-71/+103
| | | | | | | If an environment slug is predictable given only the environment name, we can use the environment slug earlier in the CI variable evaluation process as we don't have to wait for the environment record itself to be persisted.
* Merge branch 'winh-remove-gitlab-ui-visual-job' into 'master'Clement Ho2019-07-191-31/+0
|\ | | | | | | | | | | | | Remove gitlab:ui:visual job Closes #64666 See merge request gitlab-org/gitlab-ce!30918
| * Remove gitlab:ui:visual jobWinnie Hellmann2019-07-191-31/+0
|/
* Merge branch 'docs/create_issue_quick_actions' into 'master'Evan Read2019-07-181-1/+3
|\ | | | | | | | | Added mention of Quick actions See merge request gitlab-org/gitlab-ce!30881
| * Added mention of Quick actionsRussell Dickenson2019-07-181-1/+3
|/
* Merge branch 'docs/autocomplete_in_slash_commands' into 'master'Evan Read2019-07-181-0/+6
|\ | | | | | | | | Added mention of autocomplete characters See merge request gitlab-org/gitlab-ce!30877
| * Added mention of autocomplete charactersRussell Dickenson2019-07-181-0/+6
|/
* Merge branch 'qa/refactor-check-mentions-for-xss-spec' into 'master'Mark Lapierre2019-07-181-4/+4
|\ | | | | | | | | Refactor check mentions for xss test See merge request gitlab-org/gitlab-ce!30914
| * Refactor check mentions for xss testqa/refactor-check-mentions-for-xss-specWalmyr Lima2019-07-181-4/+4
| | | | | | | | | | | | | | The refactor consists in: - Better scopping preconditions and the test definition - Removing a variable that was being used in a single palce, and use the string directly instead.
* | Merge branch '64166-document-group-bulk-editing-issues-docs' into 'master'Evan Read2019-07-184-8/+41
|\ \ | | | | | | | | | | | | Add documentation for bulk editing issue milestones at group level See merge request gitlab-org/gitlab-ce!30398
| * | Add documentation page for bulk editing group issue milestonesEugenia Grieff2019-07-184-8/+41
|/ / | | | | | | | | | | - Add new page to group docs for bulk editing issues - Add link to new section to group index - Amend bulk editing page at a project level to remove issues from note
* | Merge branch 'bw-manual-sorting-docs' into 'master'Evan Read2019-07-183-1/+36
|\ \ | | | | | | | | | | | | Create documentation for the manual sorting / re-ordering capability See merge request gitlab-org/gitlab-ce!30795
| * | Create documentation for the manual sorting / re-ordering capabilityBrett Walker2019-07-183-1/+36
|/ /
* | Merge branch 'an-sidekiq-chaos' into 'master'Lin Jen-Shin2019-07-1814-42/+302
|\ \ | | | | | | | | | | | | | | | | | | Adds chaos endpoints to Sidekiq Closes #64663 See merge request gitlab-org/gitlab-ce!30814
| * | Adds chaos endpoints to Sidekiqan-sidekiq-chaosAndrew Newdigate2019-07-1814-42/+302
| | | | | | | | | | | | | | | This allows the chaos endpoints to be invoked in Sidekiq so that this environment can be tested for resilience.
* | | Merge branch 'winh-issue-link-junit-reports' into 'master'Marin Jankovski2019-07-182-0/+3
|\ \ \ | | | | | | | | | | | | | | | | Add issue link to disabled JUnit reports See merge request gitlab-org/gitlab-ce!30912
| * | | Add issue link to disabled JUnit reportsWinnie Hellmann2019-07-182-0/+3
|/ / /
* | | 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