Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cache the cache key...perf/policy-class-cache | http://jneen.net/ | 2017-07-17 | 1 | -7/+8 |
| | |||||
* | avoid #respond_to? in Cache.id_for | http://jneen.net/ | 2017-07-17 | 1 | -5/+8 |
| | |||||
* | cache DeclarativePolicy.class_for at the class level | http://jneen.net/ | 2017-07-17 | 1 | -5/+35 |
| | |||||
* | Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker34940-peek-performance-bar-doesn-t-count-cached-queries-but-shows-them | Rémy Coutable | 2017-07-17 | 1 | -1/+8 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'fix/gb/process-scheduled-background-migrations' into 'master' | Yorick Peterse | 2017-07-17 | 1 | -7/+28 |
|\ | | | | | | | | | | | | | Process scheduled background migrations as well Closes #34951 See merge request !12787 | ||||
| * | Simplify background migrations stealing code | Grzegorz Bizon | 2017-07-17 | 1 | -15/+3 |
| | | | | | | | | | | Simply re-raise an exception when it occurs, but guarantee that no background migration is lost in the process. | ||||
| * | Fix off-by-one error in background migration retriesfix/gb/process-scheduled-background-migrations | Grzegorz Bizon | 2017-07-17 | 1 | -5/+10 |
| | | |||||
| * | Recover from all exceptions when stealing bg migration | Grzegorz Bizon | 2017-07-17 | 1 | -4/+22 |
| | | | | | | | | | | It also makes it possible to gracefully retry a migration in order to avoid problems like deadlocks. | ||||
| * | Catch exceptions when stealing background migrations | Grzegorz Bizon | 2017-07-14 | 1 | -1/+6 |
| | | |||||
| * | Avoid race condition when stealing a background migration | Grzegorz Bizon | 2017-07-14 | 1 | -3/+1 |
| | | | | | | | | | | | | We first pop a job from the Sidekiq queue / scheduled set and only if this has been successfully deleted we process the job. This makes it possible to minimize a possibility of a race condition happening. | ||||
| * | Fix mocks in background migrations specs | Grzegorz Bizon | 2017-07-13 | 1 | -1/+0 |
| | | |||||
| * | Implement draining scheduled sets of background migrations | Grzegorz Bizon | 2017-07-13 | 1 | -7/+12 |
| | | |||||
| * | Extract background migratons queue class method | Grzegorz Bizon | 2017-07-11 | 1 | -2/+5 |
| | | |||||
* | | Expire cached user IDs that can see the performance after 5 minutes | Rémy Coutable | 2017-07-17 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | If we don't expire the cached user IDs, the list of IDs would become outdated when a new member is added, or when a member ios removed from the allowed group. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'remove-git-search-files' into 'master' | Sean McGivern | 2017-07-17 | 1 | -89/+0 |
|\ \ | | | | | | | | | | | | | Remove Repository#search_files See merge request !12879 | ||||
| * | | Remove Repository#search_filesremove-git-search-files | Jacob Vosmaer | 2017-07-14 | 1 | -89/+0 |
| | | | |||||
* | | | Merge branch 'gitaly-more-annotations' into 'master' | Sean McGivern | 2017-07-17 | 5 | -61/+65 |
|\ \ \ | | | | | | | | | | | | | | | | | Branch and tag refactors for Gitaly See merge request !12872 | ||||
| * | | | Gitaly migration annotations | Jacob Vosmaer | 2017-07-14 | 1 | -0/+4 |
| | | | | |||||
| * | | | Use helper instead of ad-hoc regex | Jacob Vosmaer | 2017-07-14 | 1 | -2/+1 |
| | | | | |||||
| * | | | Make commit lookups explicit | Jacob Vosmaer | 2017-07-14 | 5 | -42/+45 |
| | | | | |||||
| * | | | Remove deprecated #heads method | Jacob Vosmaer | 2017-07-14 | 1 | -7/+0 |
| | | | | |||||
| * | | | Make branch filter support private | Jacob Vosmaer | 2017-07-14 | 1 | -11/+16 |
| |/ / | |||||
* | | | Merge branch 'bjk/metric_names' into 'master' | Douwe Maan | 2017-07-14 | 4 | -49/+44 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812 | ||||
| * | | | Rename ConnectionRackMiddleware to RequestsRackMiddleware.bjk/metric_names | Pawel Chojnacki | 2017-07-13 | 2 | -40/+40 |
| | | | | | | | | | | | | | | | | + fix tests after metrics rename | ||||
| * | | | Add unit to latency metrics. | Ben Kochie | 2017-07-12 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `seconds` unit to latency metrics based on uptream naming convention[0]. [0]: https://prometheus.io/docs/practices/naming/#metric-names | ||||
| * | | | Update rack metric names | Ben Kochie | 2017-07-12 | 1 | -9/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Follow Prometheus naming conventions[0]. * Simplify metrics by adding response lables to the histogram. * Use standard `http_request_duration_seconds_...` names for the histogram. [0]: https://prometheus.io/docs/practices/naming/#metric-names | ||||
* | | | | Merge branch 'pass-before-script-as-is' into 'master' | Grzegorz Bizon | 2017-07-14 | 2 | -1/+4 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Pass before_script and script as-is preserving arrays See merge request !12680 | ||||
| * | | | Pass before_script and script as-is preserving arrayspass-before-script-as-is | Kamil Trzcinski | 2017-07-07 | 2 | -1/+4 |
| | | | | |||||
* | | | | Merge branch 'gitlab-git-repository-log' into 'master' | Sean McGivern | 2017-07-14 | 4 | -79/+102 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Gitlab::Git shuffling and Gitaly annotations See merge request !12849 | ||||
| * | | | | Indirectly migrate count_commits_between to Gitaly | Jacob Vosmaer | 2017-07-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | More Gitaly annotations | Jacob Vosmaer | 2017-07-13 | 3 | -0/+19 |
| | | | | | |||||
| * | | | | Change Git::Repository#log to return Commits | Jacob Vosmaer | 2017-07-13 | 2 | -78/+82 |
| | | | | | |||||
* | | | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master' | Sean McGivern | 2017-07-14 | 5 | -7/+28 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491 | ||||
| * | | | | | Fixes needed when GitLab sign-in is not enabled | Robin Bobbitt | 2017-07-13 | 5 | -7/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController | ||||
* | | | | | | Handle case when BroadcastMessage.current is nil | Stan Hu | 2017-07-13 | 1 | -1/+1 |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow Rails.cache.fetch occasionally returns `nil` values, which causes this endpoint to crash. Closes #35094 | ||||
* | | | | | Merge branch 'lib-git-gitaly' into 'master' | Sean McGivern | 2017-07-13 | 22 | -96/+70 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly notes to Gitlab::Git, delete diff options See merge request !12814 | ||||
| * | | | | | Try to eliminate unused diff options | Jacob Vosmaer | 2017-07-12 | 1 | -96/+4 |
| | | | | | | |||||
| * | | | | | Add Gitaly notes and annotations to Gitlab::Git | Jacob Vosmaer | 2017-07-12 | 21 | -0/+66 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master' | Robert Speicher | 2017-07-12 | 1 | -4/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Workhorse SendBlob to Gitaly Closes gitaly#356 See merge request !12313 | ||||
| * | | | | | Migrate Workhorse SendBlob to Gitaly | Ahmad Sherif | 2017-07-11 | 1 | -4/+22 |
| | | | | | | |||||
* | | | | | | Merge branch 'mr-branch-link-use-tree' into 'master' | Robert Speicher | 2017-07-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR branch link now links to tree instead of commits Closes #34243 See merge request !12763 | ||||
| * | | | | | | Add namespace for Blob | Clement Ho | 2017-07-11 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'backport-ee-2405' into 'master' | Douwe Maan | 2017-07-12 | 1 | -3/+7 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Backport "Automatically link Kerberos users and LDAP people" changes to CE See merge request !12807 | ||||
| * | | | | | Extract the finder portion of ldap_person so it can be overridden in EE | Nick Thomas | 2017-07-12 | 1 | -3/+7 |
| | | | | | | |||||
* | | | | | | Return `is_admin` attribute in the GET /user endpoint for admins | Rémy Coutable | 2017-07-12 | 1 | -1/+10 |
|/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Merge branch 'rs-issue-34941' into 'master' | Stan Hu | 2017-07-11 | 1 | -8/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilient Closes #34941 See merge request !12797 | ||||
| * | | | | | Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilient | Robert Speicher | 2017-07-11 | 1 | -8/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two methods now handle two additional real-world possibilities: 1. `config/resque.yml` not being present 2. `config/resque.yml` being present but not containing YAML Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34941 | ||||
* | | | | | | Merge branch 'sh-add-mr-simple-mode' into 'master' | Sean McGivern | 2017-07-11 | 2 | -5/+27 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a simple mode to merge request API Closes #34920 See merge request !12766 | ||||
| * | | | | | Use view=simple for simplifying merge requests API | Stan Hu | 2017-07-11 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Add a simple mode to merge request APIsh-add-mr-simple-mode | Stan Hu | 2017-07-11 | 2 | -5/+27 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current "basic" merge request API still loads too much data. For integrations like the Trello Power-up, we just need the basics. Closes #34920 |