summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use prometheus-client-mmap released, final versionpawel/use-released-prometheus-versionPawel Chojnacki2018-02-072-3/+3
|
* Merge branch '42462-edit-note' into 'master'Fatih Acet2018-02-074-47/+72
|\ | | | | | | | | | | | | Resolve "Cancelling a second comment edit doesn't return its state to before the edit" Closes #42462 See merge request gitlab-org/gitlab-ce!16869
| * Resolve "Cancelling a second comment edit doesn't return its state to before ↵Simon Knox2018-02-074-47/+72
| | | | | | | | the edit"
* | Merge branch 'axios-profile' into 'master'Fatih Acet2018-02-072-17/+25
|\ \ | | | | | | | | | | | | Replace $.ajax in profile.js with axios See merge request gitlab-org/gitlab-ce!16895
| * | Replace $.ajax in profile.js with axiosClement Ho2018-02-072-17/+25
| |/
* | Merge remote-tracking branch 'dev/master'Stan Hu2018-02-071-0/+10
|\ \ | |/ |/|
| * Update CHANGELOG.md for 10.2.8Robert Speicher2018-02-071-0/+10
| | | | | | [ci skip]
* | Merge branch 'prometheus-gem-update-to-version-0.9.1.pre.rc.1' into 'master'Stan Hu2018-02-072-3/+3
|\ \ | | | | | | | | | | | | Update prometheus gem to version 0.9.1.pre.rc.2 fixing segfaults happening on metrics deletion See merge request gitlab-org/gitlab-ce!16964
| * | Update prometheus gem to version 0.9.1.pre.rc.2 fixing segfaults happening ↵prometheus-gem-update-to-version-0.9.1.pre.rc.1Pawel Chojnacki2018-02-072-3/+3
| | | | | | | | | | | | on metrics deletion
* | | Merge branch 'axios-diff-file-editor' into 'master'Fatih Acet2018-02-071-10/+11
|\ \ \ | | | | | | | | | | | | | | | | Replace $.get in diff file editor with axios See merge request gitlab-org/gitlab-ce!16896
| * | | Replace $.get in diff file editor with axiosaxios-diff-file-editorClement Ho2018-02-021-10/+11
| | | |
* | | | Merge branch 'fix/cache-gitaly-find-commits' into 'master'Sean McGivern2018-02-072-8/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cache Gitaly FindCommit RPC response See merge request gitlab-org/gitlab-ce!16949
| * | | | Cache Gitaly FindCommit RPC responsefix/cache-gitaly-find-commitsAhmad Sherif2018-02-072-8/+56
| | | | |
* | | | | Merge branch 'osw-remove-duplicate-can-be-reverted-calls' into 'master'Stan Hu2018-02-072-2/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate calls of MergeRequest#can_be_reverted? on MR widget endpoint See merge request gitlab-org/gitlab-ce!16975
| * | | | | Address naming suggestionOswaldo Ferreira2018-02-071-4/+3
| | | | | |
| * | | | | Remove duplicate calls of MergeRequest#can_be_reverted?Oswaldo Ferreira2018-02-072-2/+15
| | | | | |
* | | | | | Merge branch 'fix_help_controller_spec' into 'master'Sean McGivern2018-02-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Updating `HelpController` spec to use an existing image See merge request gitlab-org/gitlab-ce!16977
| * | | | | Updating `HelpController` spec to use an existing imageMario de la Ossa2018-02-071-1/+1
| | | | | |
* | | | | | Merge branch '4656-ce-port-filtered-search-bar' into 'master'Clement Ho2018-02-0715-81/+108
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | CE Port: for Filtered search releated changes See merge request gitlab-org/gitlab-ce!16917
| * | | | | Import FilteredSearchTokenKeys, update class initialization syntax4656-ce-port-filtered-search-barKushal Pandya2018-02-071-5/+6
| | | | | |
| * | | | | Import and use `FilteredSearchTokenKeys` independentlyKushal Pandya2018-02-075-27/+30
| | | | | |
| * | | | | Update class initialization syntaxKushal Pandya2018-02-075-6/+14
| | | | | |
| * | | | | Export class instead of assigning to `gl`Kushal Pandya2018-02-071-4/+1
| | | | | |
| * | | | | Make class initialization configurableKushal Pandya2018-02-072-38/+57
| | | | | |
| * | | | | Remove `FilteredSearchTokenKeys` importKushal Pandya2018-02-071-1/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'ce-4813-fix-ee-projects-destroy_service_spec' into 'master'Sean McGivern2018-02-074-19/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset column information after the schema is migrated in MigrationsHelpers.schema_migrate_up! Closes gitlab-ee#4813 See merge request gitlab-org/gitlab-ce!16950
| * | | | | Reset column information after the schema is migrated in ↵ce-4813-fix-ee-projects-destroy_service_specRémy Coutable2018-02-074-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MigrationsHelpers.schema_migrate_up! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'clear-job-request-timeout' into 'master'Filipa Lacerda2018-02-072-19/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear the timeout in Jobs class after each test Closes #42830 See merge request gitlab-org/gitlab-ce!16969
| * | | | | | Clear the timeout in Jobs class after each testPhil Hughes2018-02-072-19/+28
| | | | | | |
* | | | | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-0747-118/+612
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
| * | | | | | | Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480Pawel Chojnacki2018-02-072-0/+12
| | | | | | | |
| * | | | | | | Avoid unless/elsePawel Chojnacki2018-02-071-4/+4
| | | | | | | |
| * | | | | | | Fix order of checks in editable? method.Pawel Chojnacki2018-02-073-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + address small nitpicks
| * | | | | | | Make prometheus service querying approach much nicer wrt to arity and ↵Pawel Chojnacki2018-02-074-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default function params
| * | | | | | | add i8n to the Prometheus integration settings pageMike Greiling2018-02-061-8/+8
| | | | | | | |
| * | | | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-06715-4180/+11964
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
| * | | | | | | | fix tests for find or initialize service 'prometheus'Pawel Chojnacki2018-02-061-1/+1
| | | | | | | | |
| * | | | | | | | use find_or_initialize to fetch prometheus_service instancePawel Chojnacki2018-02-061-1/+1
| | | | | | | | |
| * | | | | | | | remove unnecessary commentPawel Chojnacki2018-02-061-1/+0
| | | | | | | | |
| * | | | | | | | fix rubocop errors and ensure prometheus_installed? doesn't fail in CI tests ↵Mike Greiling2018-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where project is nil
| * | | | | | | | fix broken karma specs due to removed functionMike Greiling2018-01-312-28/+2
| | | | | | | | |
| * | | | | | | | style the prometheus integration service page according to designMike Greiling2018-01-313-10/+33
| | | | | | | | |
| * | | | | | | | hide prometheus manual integration form when auto config is activeMike Greiling2018-01-312-18/+27
| | | | | | | | |
| * | | | | | | | change prometheus service description text to match designMike Greiling2018-01-3118-18/+18
| | | | | | | | |
| * | | | | | | | add link to cluster configuration from prometheus "getting started" stateMike Greiling2018-01-314-10/+31
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-31185-1665/+3243
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
| * | | | | | | | | fix eslint and formatting issuesMike Greiling2018-01-311-4/+4
| | | | | | | | | |
| * | | | | | | | | display manage application button only when it is installedMike Greiling2018-01-311-2/+5
| | | | | | | | | |
| * | | | | | | | | internationalize the "Manage" button labelMike Greiling2018-01-301-1/+4
| | | | | | | | | |
| * | | | | | | | | add button to configure prometheus integration from cluster pageMike Greiling2018-01-303-1/+9
| | | | | | | | | |
View Lorry Controller Status