summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-53/+123
| |/ / / / / / /
* | | | | | | | Merge branch 'master' into ideMike Greiling2017-08-0730-152/+692
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
| * | | | | | | Merge branch 'gitaly-386-shell-config' into 'master'Robert Speicher2017-08-071-0/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Gitaly needs to know where to find gitlab-shell See merge request !13306
| | * | | | | | Have raketask tell gitaly where to find shellKim "BKC" Carlbäcker2017-08-041-0/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'add-star-for-action-scope' into 'master'Rémy Coutable2017-08-071-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add star for action scope, in order to delete image from registry Closes #26465 See merge request !13248
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-0721-67/+380
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (184 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| | * | | | | | Cleanup tests and add admin_container_image toLin Jen-Shin2017-08-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full_authentication_abilities. This is fine because we're going to check with can?(..) anyway
| * | | | | | | Merge branch 'bvl-nfs-circuitbreaker' into 'master'Sean McGivern2017-08-0713-7/+406
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Circuitbreaker for storage paths Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775 See merge request !11449
| | * | | | | | Use correct `Environment`-class within `Gitlab` namespaceBob Van Landuyt2017-08-073-4/+4
| | | | | | | |
| | * | | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-076-108/+91
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
| | * | | | | | | Use ruby's `File.stat` to check storage availabilityBob Van Landuyt2017-08-041-19/+15
| | | | | | | | |
| | * | | | | | | Use a Struct to keep track of failure infoBob Van Landuyt2017-08-041-11/+7
| | | | | | | | |
| | * | | | | | | Only track accessibility onceBob Van Landuyt2017-08-041-8/+14
| | | | | | | | |
| | * | | | | | | Use `keys` instead of `scan_each`Bob Van Landuyt2017-08-042-20/+10
| | | | | | | | |
| | * | | | | | | Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-042-1/+8
| | | | | | | | |
| | * | | | | | | Make sure the check works for paths with spaces.Bob Van Landuyt2017-08-041-1/+1
| | | | | | | | |
| | * | | | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-049-3/+407
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'restrict-haml-javascript' into 'master'Tim Zallmann2017-08-072-0/+15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add custom linter for inline JavaScript to haml_lint See merge request !9742
| | * | | | | | | Add custom linter for inline JavaScript to haml_lint (!9742)winniehell2017-08-072-0/+15
| | | | | | | | |
| * | | | | | | | Merge branch '32300__expose_more_attributes' into 'master'Rémy Coutable2017-08-071-14/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Expose more attributes to unauthenticated GET /projects/:id See merge request !13283
| | * | | | | | | Expose more attributes to unauthenticated GET /projects/:idTony2017-08-031-14/+11
| | | | | | | | |
| * | | | | | | | Add Korean translation to i18nHuang Tao2017-08-071-1/+2
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'mattermost_fixes' into 'master'Sean McGivern2017-08-071-6/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Mattermost integration See merge request !13305
| | * | | | | | | Fix Mattermost integrationmattermost_fixesValery Sizov2017-08-041-6/+20
| | | | | | | | |
| * | | | | | | | Merge branch 'gitaly-renames-annotations' into 'master'Sean McGivern2017-08-072-84/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Gitaly deletions and annotations See merge request !13280
| | * | | | | | | Migration link for Repository#logJacob Vosmaer2017-08-031-0/+1
| | | | | | | | |
| | * | | | | | | Remove unused methodsJacob Vosmaer2017-08-031-77/+0
| | | | | | | | |
| | * | | | | | | Remove unnecessary 'raw' aliasJacob Vosmaer2017-08-031-5/+0
| | | | | | | | |
| | * | | | | | | Rename 'commits_between' to 'rugged_commits_between'Jacob Vosmaer2017-08-032-2/+4
| | | | | | | | |
| * | | | | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'Tim Zallmann2017-08-061-4/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Timezone Inconsistencies in User Contribution Calendar Closes #27616 and #1943 See merge request !13208
| | * | | | | | | | fix rubocop violations 👮Mike Greiling2017-07-311-4/+4
| | | | | | | | | |
| | * | | | | | | | fix mysql syntax for date INTERVAL arithmaticMike Greiling2017-07-311-3/+7
| | | | | | | | | |
| | * | | | | | | | adjust timezone for date grouping in contributions calendarMike Greiling2017-07-291-2/+4
| | | | | | | | | |
| | * | | | | | | | use timezone-aware Date.current instead of Date.today in ↵Mike Greiling2017-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContributionsCalendar class
| * | | | | | | | | Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'Robert Speicher2017-08-042-0/+19
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#last_commit_for_path to Gitaly Closes gitaly#433 See merge request !13200
| | * | | | | | | | | Migrate Repository#last_commit_for_path to GitalyAhmad Sherif2017-08-032-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#433
| * | | | | | | | | | Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'Robert Speicher2017-08-043-14/+37
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate blame loading to Gitaly Closes gitaly#421 See merge request !13155
| | * | | | | | | | | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-033-14/+37
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#421
| * | | | | | | | | Merge branch 'refactor.notification-recipient-builders' into 'master'Sean McGivern2017-08-041-4/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor.notification recipient builders See merge request !13197
| | * | | | | | | | | declarative_policy rubocop fixhttp://jneen.net/2017-08-031-2/+3
| | | | | | | | | | |
| | * | | | | | | | | short-circuit if there is no policy, and add :read_project checkhttp://jneen.net/2017-08-031-4/+9
| | |/ / / / / / / /
| * | | | | | | | | Don't bother going through an entire Banzai pipeline for empty textrs-minor-banzai-perfRobert Speicher2017-08-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bails out of `cacheless_render` immediately unless the provided text is present, since there's no point. This is a slight improvement in our test performance. Across the creation of 1,000 `Namespace` records, which caches the `description` field and which is blank by default in its factory, this saves about four seconds, which... sure. Why not.
| * | | | | | | | | Merge branch 'tc-no-todo-service-select-mysql' into 'master'Sean McGivern2017-08-032-6/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid plucking Todo ids in TodoService - take 2 See merge request !11415
| | * | | | | | | | Avoid plucking Todo ids and use sub-queries insteadToon Claes2017-08-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids
| * | | | | | | | | Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'Robert Speicher2017-08-032-11/+27
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitaly Closes gitaly#415 See merge request !13121
| | * | | | | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-022-11/+27
| | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#415
| * | | | | | | | | Merge branch 'merge-request-commits-background-migration' into 'master'Rémy Coutable2017-08-031-0/+107
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request commits background migration See merge request !12685
| | * | | | | | | | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migrationSean McGivern2017-08-031-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we stored these as serialised fields - `st_{commits,diffs}` - on the `merge_request_diffs` table. These now have their own tables - `merge_request_diff_{commits,diffs}` - with a column for each attribute of the serialised data. Add a background migration to go through the existing MR diffs and migrate them to the new format. Ignore any contents that cannot be displayed. Assuming that we have 5 million rows to migrate, and each batch of 2,500 rows can be completed in 5 minutes, this will take about 7 days to migrate everything.
| * | | | | | | | | Merge branch '28472-ignore-auto-generated-mails' into 'master'Sean McGivern2017-08-032-1/+13
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send rejection mails for all auto-generated mails Closes #28472 See merge request !13254
| | * | | | | | | | Check against "Auto-Submitted: no" insteadLin Jen-Shin2017-08-031-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would be much more accurate. We assume this is an auto-generated email if such header is provided, and the value is not "no". It could also be: "auto-generated", "auto-replied", or other values from extension. It seems that only "no" could mean that this is sent by a human. See: https://tools.ietf.org/html/rfc3834