summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-041-0/+11
|\ | | | | | | | | Prepare uploaders for personal snippets comments See merge request !11022
| * Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-0/+11
| |
* | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-0/+1
| |
* | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-032-1/+10
|\ \ | | | | | | | | | | | | Load milestone tabs asynchronously See merge request !10919
| * | Load milestone tabs asynchronouslyPhil Hughes2017-04-262-1/+10
| | |
* | | Merge branch 'remove-unused-initializer' into 'master' Douwe Maan2017-05-021-5/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove unused initializer See merge request !11036
| * | | Remove unused initializerremove-unused-initializerSean McGivern2017-05-021-5/+0
| | |/ | |/| | | | | | | We don't appear to have an `active_record_query_trace` dependency any more.
* | | Merge branch 'metrics-deployment-history' into 'master' Douwe Maan2017-05-021-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Metrics deployment history Closes #26914 See merge request !10649
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-04-2015-149/+286
| |\ \ \ | | | | | | | | | | | | | | | 26914-add_deploy_history_data_source
| * | | | Add endpoint that returns a list of deployments that happened within last ↵Pawel Chojnacki2017-03-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8.hours add index created_at
* | | | | Merge branch 'dm-snippet-download-button' into 'master' Sean McGivern2017-05-022-3/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add download button to project snippets See merge request !11004
| * | | | | Add download button to project snippetsdm-snippet-download-buttonDouwe Maan2017-04-302-3/+2
| | |_|/ / | |/| | |
* | | | | Merge branch '12910-personal-snippets-notes-show' into 'master' Sean McGivern2017-05-021-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display comments for personal snippets See merge request !10974
| * | | | | Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-021-0/+8
| | | | | |
* | | | | | Merge branch '19364-webhook-edit' into 'master' Dmitriy Zaporozhets2017-05-022-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement ability to update hooks Closes #19364 See merge request !10816
| * | | | | | Implement ability to update hooksAlexander Randa2017-04-282-3/+5
| | | | | | |
* | | | | | | Merge branch 'pdflab-in-repo' into 'master' Phil Hughes2017-05-021-0/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Move PDFLab assets into repo See merge request !10642
| * | | | | | Move PDFLab into GitLabpdflab-in-repoSam Rose2017-04-281-0/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Update Carrierwave and fog-coreZeger-Jan van de Weg2017-05-011-0/+2
| |_|/ / / |/| | | |
* | | | | Resolve "rspec_profiling is enabled for MySQL"Rémy Coutable2017-04-281-4/+4
| | | | |
* | | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2Sean McGivern2017-04-282-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Unicorn worker termination tests See merge request !10818
| * | | | Add test that asserts unicorns terminateJacob Vosmaer2017-04-262-0/+4
| | | | |
* | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-281-1/+1
| | | | |
* | | | | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-261-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Support preview_markdown action for personal_snippets See merge request !10810
| * | | | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-261-0/+1
| |/ / /
* | | | Merge branch 'test-pg' into 'master' Rémy Coutable2017-04-243-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test both PostgreSQL and MySQL for the win Closes #2582 See merge request !10156
| * \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-121-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: Setup and run a Gitaly server for testing if GitalyClient is enabled Update changelog with MR id Move permission to create subgroup into GroupPolicy Fix issue's note cache expiration after delete fix(subgroups): add verification of group creation capability to subgroup UI
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-122-4/+68
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (90 commits) Fixed notebooklab code including file paths [BB Importer] Save the error trace and the whole raw document Statisfy Robertcop and Seancop Update documents according to: Update licenses.csv via: Update templates via: Add foreign key on trigger requests Added CHANGELOG Added tests and fixed a typo Fix typo on the class merge-when-pipeline_succeeds Axil's review remove unnecessary line typo fix typo fix links Remove an unused `cared` scope from Issue and MergeRequest Remove an unused `Issue.open_for` scope add topic: authentication Fix edit button on blame page without repo perms Don't show 'Copy content' button on text files that are not rendered as text ...
| * | | | | | Add # host for development and test as wellLin Jen-Shin2017-04-111-0/+2
| | | | | | |
| * | | | | | Set profiler only for postgresql not mysqlLin Jen-Shin2017-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10156#note_26812609
| * | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-103-0/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (238 commits) Periodically clean up temporary upload files to recover storage space Add a name field to the group edit form Remove the User#is_admin? method Fix specs Enable RSpec/DescribeSymbol; update .rubocop_todo.yml Update rubocop-rspec 1.12.0 -> 1.15.0 Rename displaying_blame to blame Actually include WaitForAjax! Don't show Copy contents button on Blame page alfredo review changes Give explicit height to SVG icons for Safari Update MR title change icon Put back usernames in activity and profile feed Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run Revert yarn.lock changes add CHANGELOG.md entry for !10522 upgrade webpack-dev-server to fix issues with SockJS causing odd reload behavior in firefox upgrade webpack to v2.3.3 to resolve sourcemap issues Rever yarn.lock changes Revert yarn.lock file changes ...
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-0710-33/+99
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (590 commits) Fixes failing spec Fix icon name error Rewrite system note helper Change edit icon Leave icon area blank if legacy note; remove diamond icon Fix positioning of note icons Fix newline errors Add remaining system note icons Add system notes icon helper; add icons Fixed specs Updated JS that was causing the hints to appear & then disappear Update tests Fix broken spinach test Reuse code Improve shortcuts code Adds ShortcutsDashboardNavigation to globals comment since its a global variable Fix shortcut specs Reorganize shortcut help menu Change todos shortcut to shift Change shortcuts Switch global shortcuts to shift; reuse key styles from help menu ...
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-03-293-3/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (43 commits) Update CHANGELOG.md for 9.0.1 Support wider range of monitored environments with Prometheus Add changelog entry Don't include branch name in Knapsack report file Add a new `stub_mattermost_setting` stub helper to properly stub Mattermost settings Fixed issue boards sidebar alignment Fixed alignment of tooltip on card assignee Stops triggering board sidebar when clicking avatar Get rid of a third N+1 query problem Get rid of second N+1 query problem Get rid of a first N+1 query problem Add N+1 query problem specs for Issue and MergeRequest ReferenceFilter classes Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch` Use `:empty_project` where possible in service specs Adds entry about kebab case props in documentation Fix sub-nav highlighting for `Environments` and `Jobs` pages spread out webpack bundles per-line to reduce conflicts in EE Improve UX guide on tooltips Correct example value variable name. If wget fails, remove the empty file created ...
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-03-272-1/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (127 commits) Fixed up issue boards JS specs Implement new service for creating user Add Changelog entry for pipeline retry fix Do not retry jobs multiple times when retrying a pipeline Update sentry-raven 2.0.2 -> 2.4.0 Update webmock 1.21.0 -> 1.24.6 Update spring 1.7.2 -> 2.0.1 Update simplecov 0.12.0 -> 0.14.1 Update pry-rails 0.3.4 -> 0.3.5 Update pry-byebug 3.4.1 -> 3.4.2 Update flay 2.6.1 -> 2.8.1 Optimize labels finder query Remove Tags filter from Projects Explore dropdown Update capybara-screenshot 1.0.11 -> 1.0.14 Update bullet 5.2.0 -> 5.5.1 Update brakeman 3.4.1 -> 3.6.1 Remove web-console gem Update better_errors 1.0.1 -> 2.1.1 Display flash message to unauthenticated user when creating new issue Activate group name toggle based on horizontal space ...
| * | | | | | | | | | Test both PostgreSQL and MySQL for the win.Lin Jen-Shin2017-03-241-1/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'workhorse-secret-path' into 'master' Rémy Coutable2017-04-242-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make location of gitlab_workhorse_secret configurable See merge request !10357
| * | | | | | | | | | | Make location of gitlab_workhorse_secret configurableJakub Jirutka2017-04-192-0/+11
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hard-coding location of configuration files is very bad practice. This patch applies the same approach as currently used for gitlab_shell_secret file.
* | | | | | | | | | | Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-211-1/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-193-7/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping port Closes #27750 See merge request !10481
| * | | | | | | | | Don't use `send` in settings initializerSean McGivern2017-04-141-6/+6
| | | | | | | | | |
| * | | | | | | | | Remove unused user activities codeSean McGivern2017-04-141-2/+2
| | | | | | | | | |
| * | | | | | | | | Rename user cohorts -> cohortsSean McGivern2017-04-141-1/+1
| | | | | | | | | |
| * | | | | | | | | Add user cohorts table to admin areaSean McGivern2017-04-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This table shows the percentage of users who registered in the last twelve months, who last signed in during or later than each of those twelve months, by month. It is only enabled when the usage ping is enabled, and the page also shows pretty-printed usage ping data. The cohorts table is generated in Ruby from some basic SQL queries, because performing the gap-filling and running sums needed in both MySQL and Postgres is painful.
| * | | | | | | | | Add new ScheduleUpdateUserActivityWorker and UpdateUserActivityWorkerRémy Coutable2017-04-142-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | Port 'Add more usage data to EE ping' to CESean McGivern2017-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/735
| * | | | | | | | | Port 'Add EE usage ping' to CESean McGivern2017-04-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/557
* | | | | | | | | | Remove special naming of pipelines folderFilipa Lacerda2017-04-191-9/+9
| | | | | | | | | |
* | | | | | | | | | Remove format from end of URL for URLs that take a ref or pathDouwe Maan2017-04-172-101/+70
| | | | | | | | | |
* | | | | | | | | | Issue Title Vue: convert to .vue - use 'render' with 'createElement' in indexRegis Boudinot2017-04-151-0/+1
| | | | | | | | | |
* | | | | | | | | | Turn on caching of classes in Knapsack specsStan Hu2017-04-141-1/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling caching of classes slows start-up time because all controllers are loaded at initialization, but it reduces memory and load because files are not reloaded with every request. For example, caching is not necessary for loading database migrations but useful for handling Knapsack specs. Addresses gitlab-org/gitlab-ee#2162